Merge branch 'master' into 0929-master

liusheng

2025-10-21 2d84b9771e11b64f4224c57ebc36a157fe9a15b4

 smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java

@@ -22,8 +22,11 @@
     * @return 结果
     */
    @Override
    public List<Map<String,Object>> getList() {
       List<Map<String,Object>> lists= utilsMapper.getList("select * from service_telinfo where state=0 ");
    public List<Map<String,Object>> getList(String orgid) {
        String where=" where (state=0  OR DATE_ADD(editTime, INTERVAL 10 MINUTE)< NOW()) ";
        if(ObjectUtils.isNotEmpty(orgid))
            where=where+" and orgid='"+orgid+"'";
       List<Map<String,Object>> lists= utilsMapper.getList("select * from service_telinfo " +where);
        return lists;
    }
    /**