20230308_sun修正行政区划完整名从redis取

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglGlbtServiceImpl.java

@@ -21,7 +21,8 @@ import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.enums.*;
 import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.domain.SysDeptJl;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import io.seata.common.util.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -72,7 +73,7 @@ public class ZwywBtglGlbtServiceImpl implements IZwywBtglGlbtService
     public ZwywBtglGlbt selectZwywBtglGlbtById(String id)
     {
         ZwywBtglGlbt res = zwywBtglGlbtMapper.selectById(id);
-        res.setXzqhNames(sysDeptJlMapper.getXzqhNames(res.getXzqh()));
+        res.setXzqhNames(SysDeptJlUtils.getDeptCache(res.getXzqh()));
         SysDeptJl dept = sysDeptJlMapper.selectSysDeptJlByCode(res.getXzqh());
         res.setXzqh(sysDeptJlMapper.getXzqhCodes(res.getXzqh()));
         res.setAge(DateUtils.getCurrentAge(DateUtils.dateTime(YYYYMMDD, res.getCsrq())) + "岁");
@@ -165,7 +166,7 @@ public class ZwywBtglGlbtServiceImpl implements IZwywBtglGlbtService
         }
         List<ZwywBtglGlbt> res = zwywBtglGlbtMapper.selectList(lqw);
         res.forEach(r -> {
-            r.setXzqhNames(sysDeptJlMapper.getXzqhNames(r.getXzqh()));
+            r.setXzqhNames(SysDeptJlUtils.getDeptCache(r.getXzqh()));
             r.setAge(DateUtils.getCurrentAge(DateUtils.dateTime(YYYYMMDD, r.getCsrq())) + "岁");
             setDeptLevelInfo(r);
             if (StringUtils.equals(r.getStatus(), AdvancedStatus.JD.getCode())) {
@@ -221,7 +222,7 @@ public class ZwywBtglGlbtServiceImpl implements IZwywBtglGlbtService
         zwywBtglGlbt.setStatus(null);
         List<ZwywBtglGlbt> res = zwywBtglGlbtMapper.selectPortalBtglGlbtList(zwywBtglGlbt);
         res.forEach(r -> {
-            r.setXzqhNames(sysDeptJlMapper.getXzqhNames(r.getXzqh()));
+            r.setXzqhNames(SysDeptJlUtils.getDeptCache(r.getXzqh()));
             r.setAge(DateUtils.getCurrentAge(DateUtils.dateTime(YYYYMMDD, r.getCsrq())) + "岁");
         });
         return res;

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglGlbtmxServiceImpl.java

@@ -11,7 +11,8 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.DeptLevelStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -54,7 +55,7 @@ public class ZwywBtglGlbtmxServiceImpl implements IZwywBtglGlbtmxService
     {
         ZwywBtglGlbtmx res = zwywBtglGlbtmxMapper.selectGlbtmxById(id);
         res.setGlbt(zwywBtglGlbtMapper.selectById(res.getGlbtId()));
-        res.getGlbt().setXzqhNames(sysDeptJlMapper.getXzqhNames(res.getGlbt().getXzqh()));
+        res.getGlbt().setXzqhNames(SysDeptJlUtils.getDeptCache(res.getGlbt().getXzqh()));
         return res;
     }
 
@@ -71,7 +72,7 @@ public class ZwywBtglGlbtmxServiceImpl implements IZwywBtglGlbtmxService
         res.forEach(r -> {
             setHighLevelAmount(r);
             r.setGlbt(zwywBtglGlbtMapper.selectById(r.getGlbtId()));
-            r.setFfdq(sysDeptJlMapper.getXzqhNames(r.getGlbt().getXzqh()));
+            r.setFfdq(SysDeptJlUtils.getDeptCache(r.getGlbt().getXzqh()));
             r.setSqrXm(r.getGlbt().getSqrXm());
             r.setSqrZjhm(r.getGlbt().getSqrZjhm());
             r.setFfyf(zwywBtglGlbtmx.getFfyf());
@@ -86,7 +87,7 @@ public class ZwywBtglGlbtmxServiceImpl implements IZwywBtglGlbtmxService
         res.forEach(r -> {
             setHighLevelAmount(r);
             r.setGlbt(zwywBtglGlbtMapper.selectById(r.getGlbtId()));
-            r.setFfdq(sysDeptJlMapper.getXzqhNames(r.getGlbt().getXzqh()));
+            r.setFfdq(SysDeptJlUtils.getDeptCache(r.getGlbt().getXzqh()));
             r.setAge(DateUtils.getCurrentAge(DateUtils.dateTime(YYYYMMDD, r.getGlbt().getCsrq())) + "岁");
             r.setSqrXm(r.getGlbt().getSqrXm());
             r.setSqrZjhm(r.getGlbt().getSqrZjhm());

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglGlbtqdServiceImpl.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywBtglGlbtqd;
 import com.ruoyi.business.mapper.ZwywBtglGlbtqdMapper;
 import com.ruoyi.business.service.IZwywBtglGlbtqdService;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglGlbtxmServiceImpl.java

@@ -6,7 +6,8 @@ import com.ruoyi.business.mapper.ZwywBtglGlbtxmMapper;
 import com.ruoyi.business.service.IZwywBtglGlbtxmService;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,7 +40,7 @@ public class ZwywBtglGlbtxmServiceImpl implements IZwywBtglGlbtxmService
     public ZwywBtglGlbtxm selectZwywBtglGlbtxmById(String id)
     {
         ZwywBtglGlbtxm res = zwywBtglGlbtxmMapper.selectById(id);
-        res.setXzqhName(sysDeptJlMapper.getXzqhNames(res.getXzqh()));
+        res.setXzqhName(SysDeptJlUtils.getDeptCache(res.getXzqh()));
         return res;
     }
 
@@ -53,7 +54,7 @@ public class ZwywBtglGlbtxmServiceImpl implements IZwywBtglGlbtxmService
     public List<ZwywBtglGlbtxm> selectZwywBtglGlbtxmList(ZwywBtglGlbtxm zwywBtglGlbtxm)
     {
         List<ZwywBtglGlbtxm> res = zwywBtglGlbtxmMapper.selectList(new LambdaQueryWrapper<>(zwywBtglGlbtxm));
-        res.forEach(r -> r.setXzqhName(sysDeptJlMapper.getXzqhNames(r.getXzqh())));
+        res.forEach(r -> r.setXzqhName(SysDeptJlUtils.getDeptCache(r.getXzqh())));
         return res;
     }
 

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJewhServiceImpl.java

@@ -8,7 +8,8 @@ import com.ruoyi.business.service.IZwywBtglJewhService;
 import com.ruoyi.common.security.utils.EncryptionUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.SysDeptJlStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,7 +48,7 @@ public class ZwywBtglJewhServiceImpl implements IZwywBtglJewhService
     public ZwywBtglJewh selectZwywBtglJewhById(String id)
     {
         ZwywBtglJewh res = zwywBtglJewhMapper.selectById(id);
-        res.setXzqhNames(sysDeptJlMapper.getXzqhNames(res.getXjd()));
+        res.setXzqhNames(SysDeptJlUtils.getDeptCache(res.getXjd()));
         res.setXjd(sysDeptJlMapper.getXzqhCodes(res.getXjd()));
         return res;
     }
@@ -63,7 +64,7 @@ public class ZwywBtglJewhServiceImpl implements IZwywBtglJewhService
     {
         List<ZwywBtglJewh> list = zwywBtglJewhMapper.selectZwywBtglJewhList(zwywBtglJewh);
         list.forEach(l -> {
-            l.setXjdName(sysDeptJlMapper.getXzqhNames(l.getXjd()));
+            l.setXjdName(SysDeptJlUtils.getDeptCache(l.getXjd()));
             l.setEditFlg(SecurityUtils.getAreaCode().equals(l.getCreateAreaCode()));
         });
         return list;
@@ -76,8 +77,8 @@ public class ZwywBtglJewhServiceImpl implements IZwywBtglJewhService
              EncryptionUtils.encryptionMap(r, new ZwywBtglLrqdmx());
              Map<String, Object> map = sysDeptJlMapper.selectJlDeptByParams(null, r.get("ffdq").toString());
              if (ObjectUtils.isNotEmpty(map)) {
-                 r.put("xzqhIds", sysDeptJlMapper.getXzqhIds(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
-                 r.put("xzqhNames", sysDeptJlMapper.getXzqhNames(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
+                 //r.put("xzqhIds", sysDeptJlMapper.getXzqhIds(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
+                 r.put("xzqhNames", SysDeptJlUtils.getDeptCache(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
              }
          });
         return Lrlist;
@@ -87,7 +88,7 @@ public class ZwywBtglJewhServiceImpl implements IZwywBtglJewhService
     public List<ZwywBtglJewh> selectBgspList(ZwywBtglJewh zwywBtglJewh) {
         List<ZwywBtglJewh> res = zwywBtglJewhMapper.selectBgspList(zwywBtglJewh);
         res.forEach(r -> {
-            r.setXjdName(sysDeptJlMapper.getXzqhNames(r.getXjd()));
+            r.setXjdName(SysDeptJlUtils.getDeptCache(r.getXjd()));
         });
         return res;
     }

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgbtServiceImpl.java

@@ -11,7 +11,8 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.security.utils.AmountUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.DataStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,7 +49,7 @@ public class ZwywBtglJgbtServiceImpl implements IZwywBtglJgbtService
     public ZwywBtglJgbt selectZwywBtglJgbtById(String id)
     {
         ZwywBtglJgbt res = zwywBtglJgbtMapper.selectById(id);
-        res.setSsqhNames(sysDeptJlMapper.getXzqhNames(res.getJgssqh()));
+        res.setSsqhNames(SysDeptJlUtils.getDeptCache(res.getJgssqh()));
         res.setJgssqh(sysDeptJlMapper.getXzqhCodes(res.getJgssqh()));
         return res;
     }
@@ -63,7 +64,7 @@ public class ZwywBtglJgbtServiceImpl implements IZwywBtglJgbtService
     public List<ZwywBtglJgbt> selectZwywBtglJgbtList(ZwywBtglJgbt zwywBtglJgbt)
     {
         List<ZwywBtglJgbt> res = zwywBtglJgbtMapper.selectZwywBtglJgbtList(zwywBtglJgbt);
-        res.forEach(r -> r.setSsqhNames(sysDeptJlMapper.getXzqhNames(r.getJgssqh())));
+        res.forEach(r -> r.setSsqhNames(SysDeptJlUtils.getDeptCache(r.getJgssqh())));
         return res;
     }
 

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgbthpServiceImpl.java

@@ -15,7 +15,8 @@ import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.DataStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,7 +67,7 @@ public class ZwywBtglJgbthpServiceImpl implements IZwywBtglJgbthpService
     {
         List<ZwywBtglJgbthp> res = zwywBtglJgbthpMapper.selectZwywBtglJgbthpList(zwywBtglJgbthp);
         res.forEach(r -> {
-            r.setSsqhNames(sysDeptJlMapper.getXzqhNames(r.getSsqh()));
+            r.setSsqhNames(SysDeptJlUtils.getDeptCache(r.getSsqh()));
             r.setScsj(r.getCreateTimeStr().substring(0, 8));
         });
         return res;
@@ -76,7 +77,7 @@ public class ZwywBtglJgbthpServiceImpl implements IZwywBtglJgbthpService
     public List<Map<String,Object>> selectYhqdList(ZwywBtglJgbthp zwywBtglJgbthp) {
         zwywBtglJgbthp.setXzqhId(SecurityUtils.getAreaCode());
         List<Map<String,Object>> list = zwywBtglJgbthpMapper.selectYhqdList(zwywBtglJgbthp);
-        list.forEach(l -> l.put("ssqhNames", sysDeptJlMapper.getXzqhNames(l.get("ssqh").toString())));
+        list.forEach(l -> l.put("ssqhNames", SysDeptJlUtils.getDeptCache(l.get("ssqh").toString())));
         return list;
     }
 
@@ -89,7 +90,7 @@ public class ZwywBtglJgbthpServiceImpl implements IZwywBtglJgbthpService
                 .eq(ZwywBtglJgqdmx::getStatus, DataStatus.DELETE.getCode())
                 .eq(ZwywBtglJgqdmx::getSsqh, ssqh);
         List<ZwywBtglJgqdmx> res = zwywBtglJgqdmxMapper.selectList(lqw);
-        res.forEach(r -> r.setSsqh(sysDeptJlMapper.getXzqhNames(r.getSsqh())));
+        res.forEach(r -> r.setSsqh(SysDeptJlUtils.getDeptCache(r.getSsqh())));
         return res;
     }
     /**

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgjewhServiceImpl.java

@@ -8,7 +8,8 @@ import com.ruoyi.business.domain.ZwywBtglJgqdmx;
 import com.ruoyi.business.mapper.ZwywBtglJgjewhMapper;
 import com.ruoyi.business.mapper.ZwywBtglJgqdmxMapper;
 import com.ruoyi.business.service.IZwywBtglJgjewhService;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,7 +43,7 @@ public class ZwywBtglJgjewhServiceImpl implements IZwywBtglJgjewhService
     @Override
     public ZwywBtglJgjewh selectZwywBtglJgjewhById(String id) {
         ZwywBtglJgjewh res = zwywBtglJgjewhMapper.selectById(id);
-        res.setXzqhNames(sysDeptJlMapper.getXzqhNames(res.getSsqh()));
+        res.setXzqhNames(SysDeptJlUtils.getDeptCache(res.getSsqh()));
         res.setSsqh(sysDeptJlMapper.getXzqhCodes(res.getSsqh()));
         return res;
     }
@@ -58,7 +59,7 @@ public class ZwywBtglJgjewhServiceImpl implements IZwywBtglJgjewhService
     {
         List<ZwywBtglJgjewh> res = zwywBtglJgjewhMapper.selectZwywBtglJgjewhList(zwywBtglJgjewh);
         res.forEach(r -> {
-            r.setXzqhNames(sysDeptJlMapper.getXzqhNames(r.getSsqh()));
+            r.setXzqhNames(SysDeptJlUtils.getDeptCache(r.getSsqh()));
         });
         return res;
     }
@@ -67,7 +68,7 @@ public class ZwywBtglJgjewhServiceImpl implements IZwywBtglJgjewhService
     public List<ZwywBtglJgjewh> selectBgspList(ZwywBtglJgjewh zwywBtglJgjewh) {
         List<ZwywBtglJgjewh> res = zwywBtglJgjewhMapper.selectBgspList(zwywBtglJgjewh);
         res.forEach(r -> {
-            r.setXzqhNames(sysDeptJlMapper.getXzqhNames(r.getSsqh()));
+            r.setXzqhNames(SysDeptJlUtils.getDeptCache(r.getSsqh()));
         });
         return res;
     }

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgqdServiceImpl.java

@@ -17,7 +17,8 @@ import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.DataStatus;
 import com.ruoyi.system.api.enums.ExamineStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.SubCodeUtil;
 import io.seata.common.util.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -73,8 +74,8 @@ public class ZwywBtglJgqdServiceImpl implements IZwywBtglJgqdService {
     public List<ZwywBtglJgqd> selectZwywBtglJgqdList(ZwywBtglJgqd zwywBtglJgqd) {
         List<ZwywBtglJgqd> res = zwywBtglJgqdMapper.selectZwywBtglJgqdList(zwywBtglJgqd);
         res.forEach(r -> {
-            r.setXzqhIds(sysDeptJlMapper.getXzqhIds(r.getSsqh()));
-            r.setXzqhNames(sysDeptJlMapper.getXzqhNames(r.getSsqh()));
+            //r.setXzqhIds(sysDeptJlMapper.getXzqhIds(r.getSsqh()));
+            r.setXzqhNames(SysDeptJlUtils.getDeptCache(r.getSsqh()));
             r.setScsj(r.getCreateTimeStr());
         });
         return res;
@@ -119,8 +120,8 @@ public class ZwywBtglJgqdServiceImpl implements IZwywBtglJgqdService {
                 map.put("zjgs",count);
                 map.put("btlx",xm.getJgxmlb());
                 map.put("ffyf",zwywBtglJgqd.getFfyf());
-                map.put("xzqhIds", sysDeptJlMapper.getXzqhIds(xm.getYyfw()));
-                map.put("xzqhNames", sysDeptJlMapper.getXzqhNames(xm.getYyfw()));
+                //map.put("xzqhIds", sysDeptJlMapper.getXzqhIds(xm.getYyfw()));
+                map.put("xzqhNames", SysDeptJlUtils.getDeptCache(xm.getYyfw()));
                 map.put("zje", String.valueOf(jeNum));
                 res.add(map);
             }
@@ -139,7 +140,7 @@ public class ZwywBtglJgqdServiceImpl implements IZwywBtglJgqdService {
                 .eq(ZwywBtglJgqdmx::getQdId, id);
         List<ZwywBtglJgqdmx> res = zwywBtglJgqdmxMapper.selectList(lqw);
         res.forEach(r -> {
-            r.setSsqh(sysDeptJlMapper.getXzqhNames(r.getSsqh()));
+            r.setSsqh(SysDeptJlUtils.getDeptCache(r.getSsqh()));
         });
         return res;
     }

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglLrbthpServiceImpl.java

@@ -15,7 +15,8 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.DataStatus;
 import com.ruoyi.system.api.enums.SysDeptJlStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,7 +67,7 @@ public class ZwywBtglLrbthpServiceImpl implements IZwywBtglLrbthpService
     {
         List<ZwywBtglLrbthp> res = zwywBtglLrbthpMapper.selectZwywBtglLrbthpList(zwywBtglLrbthp);
         res.forEach(r -> {
-            r.setSsqhNames(sysDeptJlMapper.getXzqhNames(r.getSsqh()));
+            r.setSsqhNames(SysDeptJlUtils.getDeptCache(r.getSsqh()));
             r.setScsj(r.getCreateTimeStr().substring(0,8));
         });
         return res;
@@ -102,7 +103,7 @@ public class ZwywBtglLrbthpServiceImpl implements IZwywBtglLrbthpService
                 .eq(ZwywBtglLrqdmx::getFfdq, ssqh);
         List<ZwywBtglLrqdmx> res = zwywBtglLrqdmxMapper.selectList(lqw);
         res.forEach(r ->{
-            r.setFfdq(sysDeptJlMapper.getXzqhNames(sysDeptJlMapper.id2code(r.getFfdq())));
+            r.setFfdq(SysDeptJlUtils.getDeptCache(sysDeptJlMapper.id2code(r.getFfdq())));
             if ("0".equals(r.getIsPresent())){
                 r.setCreateUnit(SecurityUtils.getUserUnitId());
             }

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglLrqdServiceImpl.java

@@ -17,7 +17,8 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.DataStatus;
 import com.ruoyi.system.api.enums.ExamineStatus;
 import com.ruoyi.system.api.enums.SysDeptJlStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.SubCodeUtil;
 import io.seata.common.util.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -79,8 +80,8 @@ public class ZwywBtglLrqdServiceImpl implements IZwywBtglLrqdService
             Map<String, Object> map = sysDeptJlMapper.selectJlDeptByParams(null, r.getSsqh());
             if (ObjectUtils.isNotEmpty(map)) {
                 if (map.containsKey(SysDeptJlStatus.CODE.getCode())) {
-                    r.setXzqhIds(sysDeptJlMapper.getXzqhIds(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
-                    r.setXzqhNames(sysDeptJlMapper.getXzqhNames(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
+                    //r.setXzqhIds(sysDeptJlMapper.getXzqhIds(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
+                    r.setXzqhNames(SysDeptJlUtils.getDeptCache(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
                 }
             }
             LambdaQueryWrapper<ZwywBtglLrqdmx> lqw = new LambdaQueryWrapper<ZwywBtglLrqdmx>()
@@ -129,8 +130,8 @@ public class ZwywBtglLrqdServiceImpl implements IZwywBtglLrqdService
                 map.put("zrs", count);
                 map.put("btlx", xm.getLrxmlb());
                 map.put("ffyf", zwywBtglLrqd.getFfyf());
-                map.put("xzqhIds", sysDeptJlMapper.getXzqhIds(xm.getYyfw()));
-                map.put("xzqhNames", sysDeptJlMapper.getXzqhNames(xm.getYyfw()));
+                //map.put("xzqhIds", sysDeptJlMapper.getXzqhIds(xm.getYyfw()));
+                map.put("xzqhNames", SysDeptJlUtils.getDeptCache(xm.getYyfw()));
                 map.put("zje", String.valueOf(jeNum));
                 map.put("createUnit",SecurityUtils.getUserUnitId());
                 res.add(map);
@@ -153,7 +154,7 @@ public class ZwywBtglLrqdServiceImpl implements IZwywBtglLrqdService
             Map<String, Object> map = sysDeptJlMapper.selectJlDeptByParams(null, r.getFfdq());
             if (ObjectUtils.isNotEmpty(map)) {
                 if (map.containsKey(SysDeptJlStatus.CODE.getCode())) {
-                    r.setSsqh(sysDeptJlMapper.getXzqhNames(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
+                    r.setSsqh(SysDeptJlUtils.getDeptCache(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
                 }
             }
             r.setZje(r.getBtje());

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglLrqdmxServiceImpl.java

@@ -7,7 +7,8 @@ import com.ruoyi.business.mapper.ZwywBtglLrhcMapper;
 import com.ruoyi.business.mapper.ZwywBtglLrqdmxMapper;
 import com.ruoyi.business.service.IZwywBtglLrqdmxService;
 import com.ruoyi.system.api.enums.SysDeptJlStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,7 +70,7 @@ public class ZwywBtglLrqdmxServiceImpl implements IZwywBtglLrqdmxService
                 Map<String, Object> map = sysDeptJlMapper.selectJlDeptByParams(null, ffdq);
                 if (ObjectUtils.isNotEmpty(map)) {
                     if (map.containsKey(SysDeptJlStatus.CODE.getCode())) {
-                        list.get(i).setSsqh(sysDeptJlMapper.getXzqhNames(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
+                        list.get(i).setSsqh(SysDeptJlUtils.getDeptCache(map.get(SysDeptJlStatus.CODE.getCode()).toString()));
                     }
                 }
             }

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglXmglServiceImpl.java

@@ -8,7 +8,8 @@ import com.ruoyi.business.service.IZwywBtglXmglService;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -64,7 +65,7 @@ public class ZwywBtglXmglServiceImpl implements IZwywBtglXmglService
         LambdaQueryWrapper<ZwywBtglXmgl> lqw = new LambdaQueryWrapper<>(zwywBtglXmgl)
                 .eq(ZwywBtglXmgl::getCreateAreaCode, SecurityUtils.getAreaCode());
         List<ZwywBtglXmgl> res = zwywBtglXmglMapper.selectList(lqw);
-        res.forEach(r -> r.setYyfw(sysDeptJlMapper.getXzqhNames(r.getYyfw())));
+        res.forEach(r -> r.setYyfw(SysDeptJlUtils.getDeptCache(r.getYyfw())));
         return res;
     }
 

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/DjpdSqServiceImpl.java

@@ -21,7 +21,8 @@ import com.ruoyi.system.api.enums.*;
 import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.domain.SysDjpdzbJbpz;
 import com.ruoyi.system.domain.vo.TaskVo;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.mapper.SysDjpdzbJbpzMapper;
 import com.ruoyi.system.mapper.TaskMapper;
 import com.ruoyi.system.service.impl.ProcessDefinitionServiceImpl;
@@ -109,7 +110,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
     public DjpdSq selectDjpdSqById(String id) {
         DjpdSq res = djpdSqMapper.selectCommonDjpdSq(id);
         if (ObjectUtils.isNotEmpty(res)) {
-            res.setSzxzqh(sysDeptJlMapper.getXzqhNames(res.getSzxzqhId()));
+            res.setSzxzqh(SysDeptJlUtils.getDeptCache(res.getSzxzqhId()));
         }
         return res;
     }
@@ -205,7 +206,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
                 cqList.add("0");
             }
             List<Pdzj> zjList = pdzjMapper.selectCommonList(cqList);
-            zjList.forEach(z -> z.setDwqhId(sysDeptJlMapper.getXzqhNames(z.getDwqhId())));
+            zjList.forEach(z -> z.setDwqhId(SysDeptJlUtils.getDeptCache(z.getDwqhId())));
             zjMap.put("djpdZj", zjList);
             zjMap.put("title", "等级评定专家名单");
             xqList.add(sqMap);
@@ -265,7 +266,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
                 cqList.add("0");
             }
             List<Pdzj> zjList = pdzjMapper.selectCommonList(cqList);
-            zjList.forEach(z -> z.setDwqhId(sysDeptJlMapper.getXzqhNames(z.getDwqhId())));
+            zjList.forEach(z -> z.setDwqhId(SysDeptJlUtils.getDeptCache(z.getDwqhId())));
             zjMap.put("djpdZj", zjList);
             zjMap.put("title", "等级评定专家名单");
             Map<String, Object> jbpzMap = new HashMap<>();
@@ -352,7 +353,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
         }
         List<DjpdSq> res = djpdSqMapper.selectList(lqw);
         res.forEach(r -> {
-            r.setSzxzqh(sysDeptJlMapper.getXzqhNames(r.getSzxzqhId()));
+            r.setSzxzqh(SysDeptJlUtils.getDeptCache(r.getSzxzqhId()));
             r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType()));
         });
         return res;

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/PdzjCyjlServiceImpl.java

@@ -5,7 +5,8 @@ import com.ruoyi.business.domain.PdzjCyjl;
 import com.ruoyi.business.mapper.PdzjCyjlMapper;
 import com.ruoyi.business.mapper.PdzjMapper;
 import com.ruoyi.business.service.IPdzjCyjlService;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,7 +44,7 @@ public class PdzjCyjlServiceImpl implements IPdzjCyjlService
     public PdzjCyjl selectPdzjCyjlById(String id)
     {
         PdzjCyjl res = pdzjCyjlMapper.selectById(id);
-        res.setDwqhNames(sysDeptJlMapper.getXzqhNames(res.getDwqhId()));
+        res.setDwqhNames(SysDeptJlUtils.getDeptCache(res.getDwqhId()));
         res.setDwqhId(sysDeptJlMapper.getXzqhCodes(res.getDwqhId()));
         return res;
     }
@@ -59,7 +60,7 @@ public class PdzjCyjlServiceImpl implements IPdzjCyjlService
     {
         List<PdzjCyjl> res = pdzjCyjlMapper.selectList(new LambdaQueryWrapper<>(pdzjCyjl));
         res.forEach(r -> {
-            r.setDwqhId(sysDeptJlMapper.getXzqhNames(r.getDwqhId()));
+            r.setDwqhId(SysDeptJlUtils.getDeptCache(r.getDwqhId()));
         });
         return res;
     }

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/PdzjServiceImpl.java

@@ -18,7 +18,8 @@ import com.ruoyi.system.api.enums.DataStatus;
 import com.ruoyi.system.api.enums.SexStatus;
 import com.ruoyi.system.api.enums.SysUserTypeStatus;
 import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,8 +67,8 @@ public class PdzjServiceImpl implements IPdzjService
     public Pdzj selectPdzjById(String id)
     {
         Pdzj res = pdzjMapper.selectById(id);
-        res.setHjqhNames(sysDeptJlMapper.getXzqhNames(res.getHjqhId()));
-        res.setDwqhNames(sysDeptJlMapper.getXzqhNames(res.getDwqhId()));
+        res.setHjqhNames(SysDeptJlUtils.getDeptCache(res.getHjqhId()));
+        res.setDwqhNames(SysDeptJlUtils.getDeptCache(res.getDwqhId()));
         res.setHjqhId(sysDeptJlMapper.getXzqhCodes(res.getHjqhId()));
         res.setDwqhId(sysDeptJlMapper.getXzqhCodes(res.getDwqhId()));
         return res;

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/ZwywBgdjpdSqServiceImpl.java

@@ -14,7 +14,8 @@ import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.system.api.enums.ChangeAppStatus;
 import com.ruoyi.system.api.enums.ExamineStatus;
 import com.ruoyi.system.api.enums.SysDeptJlStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.SysUserTypeUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -72,7 +73,7 @@ public class ZwywBgdjpdSqServiceImpl implements IZwywBgdjpdSqService
     {
         List<ZwywBgdjpdSq> res = zwywBgdjpdSqMapper.selectZwywBgdjpdSqList(zwywBgdjpdSq);
         res.forEach(r -> {
-            r.setXzqh(sysDeptJlMapper.getXzqhNames(r.getXzqh()));
+            r.setXzqh(SysDeptJlUtils.getDeptCache(r.getXzqh()));
             r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType()));
         });
         return res;
@@ -131,7 +132,7 @@ public class ZwywBgdjpdSqServiceImpl implements IZwywBgdjpdSqService
     public Map<String, Object> selectJgByXydm(YljgJcxx yljgJcxx) {
         Map<String, Object> res = zwywBgdjpdSqMapper.selectJgByXydm(yljgJcxx.getId());
         if (ObjectUtils.isNotEmpty(res)) {
-            res.put(SysDeptJlStatus.SSXZQH.getCode(), sysDeptJlMapper.getXzqhNames(res
+            res.put(SysDeptJlStatus.SSXZQH.getCode(), SysDeptJlUtils.getDeptCache(res
                     .get(SysDeptJlStatus.SSXZQHCODE.getCode()).toString()));
             LambdaQueryWrapper<DjpdSq> lqw = new LambdaQueryWrapper<DjpdSq>()
                 .eq(DjpdSq::getJgId, res.get("id").toString());

ruoyi-modules/mz-business-hljnds/src/main/java/com/ruoyi/business/service/impl/ZwywHldsJfServiceImpl.java

@@ -4,8 +4,8 @@ import com.ruoyi.business.domain.ZwywHldsJf;
 import com.ruoyi.business.mapper.ZwywHldsJfMapper;
 import com.ruoyi.business.service.IZwywHldsJfService;
 import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.mapper.SysDeptJlMapper;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +15,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+;
+
 /**
  * 经费情况Service业务层处理
  *
@@ -54,7 +56,7 @@ public class ZwywHldsJfServiceImpl implements IZwywHldsJfService
     public List<ZwywHldsJf> selectZwywHldsJfList(ZwywHldsJf zwywHldsJf)
     {
         List<ZwywHldsJf> res = zwywHldsJfMapper.selectJfList(zwywHldsJf);
-        res.forEach(r -> r.setSqMc(sysDeptJlMapper.getXzqhNames(r.getSq()) + "赛区"));
+        res.forEach(r -> r.setSqMc(SysDeptJlUtils.getDeptCache(r.getSq()) + "赛区"));
         return res;
     }
 

ruoyi-modules/mz-business-hljnds/src/main/java/com/ruoyi/business/service/impl/ZwywHldsXsxxServiceImpl.java

@@ -8,7 +8,8 @@ import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.domain.SysHljndsSqwh;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.mapper.SysHljndsSqwhMapper;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.apache.commons.lang3.ObjectUtils;
@@ -48,7 +49,7 @@ public class ZwywHldsXsxxServiceImpl implements IZwywHldsXsxxService
         ZwywHldsXsxx res = zwywHldsXsxxMapper.selectById(id);
         SysHljndsSqwh sysHljndsSqwh = sysHljndsSqwhMapper.selectById(res.getSqwhId());
         res.setMc(sysHljndsSqwh.getMc());
-        res.setSqMc(sysDeptJlMapper.getXzqhNames(res.getSq()));
+        res.setSqMc(SysDeptJlUtils.getDeptCache(res.getSq()));
         res.setSq(sysDeptJlMapper.getXzqhCodes(res.getSq()));
         return res;
     }
@@ -65,7 +66,7 @@ public class ZwywHldsXsxxServiceImpl implements IZwywHldsXsxxService
         zwywHldsXsxx.setCreateAreaCode(SubCodeUtil.getSubCode(SecurityUtils.getAreaCode()).get("level"));
         List<ZwywHldsXsxx> res = zwywHldsXsxxMapper.selectZwywHldsXsxxList(zwywHldsXsxx);
         res.forEach(r ->{
-                    r.setSqMc(sysDeptJlMapper.getXzqhNames(r.getSq()) + "赛区");
+                    r.setSqMc(SysDeptJlUtils.getDeptCache(r.getSq()) + "赛区");
                     ZwywHldsXsxx zwywHldsXsxx1 = zwywHldsXsxxMapper.selectById(r.getId());
                     r.setCjrId(zwywHldsXsxx1.getCreateUserId());
                 }

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/service/impl/ZwywCyryLhcjmdServiceImpl.java

@@ -10,7 +10,8 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.EncryptionUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.JointStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -78,8 +79,7 @@ public class ZwywCyryLhcjmdServiceImpl implements IZwywCyryLhcjmdService
                 .eq(ObjectUtils.isNotEmpty(zwywCyryLhcjmd.getLxdh()), ZwywCyryLhcjmd::getLxdh, zwywCyryLhcjmd.getLxdh());
         List<ZwywCyryLhcjmd> res = zwywCyryLhcjmdMapper.selectList(lqw);
         res.forEach(r -> {
-            r.setSzxzqhIds(sysDeptJlMapper.getXzqhCodes(r.getSzxzqh()));
-            r.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(r.getSzxzqh()));
+            r.setSzxzqhNames(SysDeptJlUtils.getDeptCache(r.getSzxzqh()));
         });
         return res;
     }

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/service/impl/ZwywCyrySxxxServiceImpl.java

@@ -13,6 +13,7 @@ import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.EncryptionUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.api.RemoteDictDataService;
 import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.api.enums.PunishmentsStatus;
@@ -30,6 +31,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+;
+
 /**
  * 从业人员失信信息Service业务层处理
  *
@@ -65,7 +68,7 @@ public class ZwywCyrySxxxServiceImpl implements IZwywCyrySxxxService
     {
         ZwywCyrySxxx res =  zwywCyrySxxxMapper.selectById(id);
         res.setSzxzqhIds(sysDeptJlMapper.getXzqhCodes(res.getSzxzqh()));
-        res.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(res.getSzxzqh()));
+        res.setSzxzqhNames(SysDeptJlUtils.getDeptCache(res.getSzxzqh()));
         return res;
     }
 
@@ -105,7 +108,7 @@ public class ZwywCyrySxxxServiceImpl implements IZwywCyrySxxxService
         List<ZwywCyrySxxx> res = zwywCyrySxxxMapper.selectList(lqw);
         res.forEach(r -> {
             r.setNrrd(zwywLhcjNrrdMapper.selectNrrdBySxxxId(r.getId()));
-            r.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(r.getSzxzqh()));
+            r.setSzxzqhNames(SysDeptJlUtils.getDeptCache(r.getSzxzqh()));
         });
         return res;
     }

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/service/impl/ZwywCyryZdgzServiceImpl.java

@@ -15,7 +15,8 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.ProcessStatus;
 import com.ruoyi.system.api.enums.PunishmentsStatus;
 import com.ruoyi.system.api.enums.RemovalStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.EndEvent;
 import org.activiti.bpmn.model.FlowNode;
@@ -79,7 +80,7 @@ public class ZwywCyryZdgzServiceImpl implements IZwywCyryZdgzService
             zdgz.setZt(sxxx.getLzzt());
             zdgz.setSxms(sxxx.getMs());
         }
-        zdgz.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(zdgz.getSzxzqh()));
+        zdgz.setSzxzqhNames(SysDeptJlUtils.getDeptCache(zdgz.getSzxzqh()));
         zdgz.setSzxzqhIds(sysDeptJlMapper.getXzqhCodes(zdgz.getSzxzqh()));
         return zdgz;
     }
@@ -103,7 +104,7 @@ public class ZwywCyryZdgzServiceImpl implements IZwywCyryZdgzService
                 .eq(ObjectUtils.isNotEmpty(zwywCyryZdgz.getZt()), ZwywCyryZdgz::getZt, zwywCyryZdgz.getZt())
                 .eq(ObjectUtils.isNotEmpty(zwywCyryZdgz.getLxdh()), ZwywCyryZdgz::getLxdh, zwywCyryZdgz.getLxdh());
         List<ZwywCyryZdgz> res = zwywCyryZdgzMapper.selectList(lqw);
-        res.forEach(r -> r.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(r.getSzxzqh())));
+        res.forEach(r -> r.setSzxzqhNames(SysDeptJlUtils.getDeptCache(r.getSzxzqh())));
         return res;
     }
 

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/service/impl/ZwywYljgLhcjmdServiceImpl.java

@@ -9,7 +9,8 @@ import com.ruoyi.business.service.IZwywYljgLhcjmdService;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.JointStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -76,8 +77,7 @@ public class ZwywYljgLhcjmdServiceImpl implements IZwywYljgLhcjmdService
                 .like(ObjectUtils.isNotEmpty(zwywYljgLhcjmd.getLxdh()), ZwywYljgLhcjmd::getLxdh, zwywYljgLhcjmd.getLxdh());
         List<ZwywYljgLhcjmd> res = zwywYljgLhcjmdMapper.selectList(lqw);
         res.forEach(r -> {
-            r.setSzxzqhIds(sysDeptJlMapper.getXzqhCodes(r.getSzxzqh()));
-            r.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(r.getSzxzqh()));
+            r.setSzxzqhNames(SysDeptJlUtils.getDeptCache(r.getSzxzqh()));
         });
         return res;
     }

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/service/impl/ZwywYljgSxxxServiceImpl.java

@@ -17,7 +17,8 @@ import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.api.enums.PunishmentsStatus;
 import com.ruoyi.system.api.enums.WorkFlowStatus;
 import com.ruoyi.system.domain.SysDeptJl;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.lang3.ObjectUtils;
@@ -65,7 +66,7 @@ public class ZwywYljgSxxxServiceImpl implements IZwywYljgSxxxService
     {
         ZwywYljgSxxx res = zwywYljgSxxxMapper.selectById(id);
         res.setSzxzqhIds(sysDeptJlMapper.getXzqhCodes(res.getSzxzqh()));
-        res.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(res.getSzxzqh()));
+        res.setSzxzqhNames(SysDeptJlUtils.getDeptCache(res.getSzxzqh()));
         return res;
     }
 
@@ -104,7 +105,7 @@ public class ZwywYljgSxxxServiceImpl implements IZwywYljgSxxxService
         List<ZwywYljgSxxx> res = zwywYljgSxxxMapper.selectList(lqw);
         res.forEach(r -> {
             r.setNrrd(zwywLhcjNrrdMapper.selectNrrdBySxxxId(r.getId()));
-            r.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(r.getSzxzqh()));
+            r.setSzxzqhNames(SysDeptJlUtils.getDeptCache(r.getSzxzqh()));
         });
         return res;
     }

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/service/impl/ZwywYljgZdgzServiceImpl.java

@@ -14,7 +14,8 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.enums.ProcessStatus;
 import com.ruoyi.system.api.enums.PunishmentsStatus;
 import com.ruoyi.system.api.enums.RemovalStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.EndEvent;
 import org.activiti.bpmn.model.FlowNode;
@@ -81,7 +82,7 @@ public class ZwywYljgZdgzServiceImpl implements IZwywYljgZdgzService
             zdgz.setSxms(sxxx.getMs());
         }
         zdgz.setSzxzqhIds(sysDeptJlMapper.getXzqhCodes(zdgz.getSzxzqh()));
-        zdgz.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(zdgz.getSzxzqh()));
+        zdgz.setSzxzqhNames(SysDeptJlUtils.getDeptCache(zdgz.getSzxzqh()));
         return zdgz;
     }
 
@@ -103,7 +104,7 @@ public class ZwywYljgZdgzServiceImpl implements IZwywYljgZdgzService
                 .likeRight(StringUtils.isNotEmpty(zwywYljgZdgz.getSzxzqh()), ZwywYljgZdgz::getSzxzqh,
                         SecurityUtils.unitHandler(zwywYljgZdgz.getSzxzqh()));
         List<ZwywYljgZdgz> res = zwywYljgZdgzMapper.selectList(lqw);
-        res.forEach(r -> r.setSzxzqhNames(sysDeptJlMapper.getXzqhNames(r.getSzxzqh())));
+        res.forEach(r -> r.setSzxzqhNames(SysDeptJlUtils.getDeptCache(r.getSzxzqh())));
         return res;
     }
 

ruoyi-modules/mz-business-lrgl/src/main/java/com/ruoyi/business/service/impl/ZwywLrJbxxServiceImpl.java

@@ -22,7 +22,8 @@ import com.ruoyi.system.api.RemoteDictDataService;
 import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.api.enums.SysDeptJlStatus;
 import com.ruoyi.system.domain.SysDeptJl;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.SubCodeUtil;
 import com.ruoyi.system.validate.group.AddGroup;
 import org.apache.commons.lang3.ObjectUtils;

ruoyi-modules/mz-business-tsxdxm/src/main/java/com/ruoyi/business/service/impl/ZwywTsxdCwglServiceImpl.java

@@ -16,7 +16,8 @@ import com.ruoyi.system.api.domain.SysDictType;
 import com.ruoyi.system.api.domain.SysObjDictType;
 import com.ruoyi.system.api.enums.SysDeptJlStatus;
 import com.ruoyi.system.domain.SysTsxdXmgl;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.mapper.SysTsxdXmglMapper;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.apache.catalina.security.SecurityUtil;

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/impl/ZwywXmsbCommonServiceImpl.java

@@ -16,7 +16,8 @@ import com.ruoyi.system.api.enums.DataStatus;
 import com.ruoyi.system.api.enums.ExamineStatus;
 import com.ruoyi.system.api.enums.WhetherStatus;
 import com.ruoyi.system.api.enums.XmsbStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +74,7 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
             if (ObjectUtils.isNotEmpty(xmlx)) {
                 res.setXmlxName(xmlx.getLxmc());
             }
-            res.setSzdqName(sysDeptJlMapper.getXzqhNames(res.getSzdq()));
+            res.setSzdqName(SysDeptJlUtils.getDeptCache(res.getSzdq()));
             res.setSzdq(sysDeptJlMapper.getXzqhCodes(res.getSzdq()));
             List<Map<String, Object>> maps = new ArrayList<>();
             JSONArray array = JSONArray.parseArray(res.getKz());
@@ -222,7 +223,7 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
                     }
                 }
             }
-            r.setSzdqName(sysDeptJlMapper.getXzqhNames(r.getSzdq()));
+            r.setSzdqName(SysDeptJlUtils.getDeptCache(r.getSzdq()));
             ZwywXmsbXmlx xmlx = xwywXmsbXmlxMapper.selectById(r.getXmlx());
             if (ObjectUtils.isNotEmpty(xmlx)) {
                 r.setXmlxName(xmlx.getLxmc());

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/impl/ZwywXmsbJgjsServiceImpl.java

@@ -7,7 +7,8 @@ import com.ruoyi.business.service.IZwywXmsbJgjsService;
 import com.ruoyi.common.security.utils.AmountUtils;
 import com.ruoyi.system.api.enums.ScriptStatus;
 import com.ruoyi.system.api.enums.XmsbStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -42,7 +43,7 @@ public class ZwywXmsbJgjsServiceImpl implements IZwywXmsbJgjsService
     public ZwywXmsbJgjs selectZwywXmsbJgjsById(String id)
     {
         ZwywXmsbJgjs res = zwywXmsbJgjsMapper.selectById(id);
-        res.setXzqhName(sysDeptJlMapper.getXzqhNames(res.getXzqhId()));
+        res.setXzqhName(SysDeptJlUtils.getDeptCache(res.getXzqhId()));
         res.setXzqhId(sysDeptJlMapper.getXzqhCodes(res.getXzqhId()));
         return res;
     }
@@ -58,7 +59,7 @@ public class ZwywXmsbJgjsServiceImpl implements IZwywXmsbJgjsService
     {
         LambdaQueryWrapper<ZwywXmsbJgjs> lqw = new LambdaQueryWrapper<>(zwywXmsbJgjs);
         List<ZwywXmsbJgjs> res = zwywXmsbJgjsMapper.selectList(lqw);
-        res.forEach(r -> r.setXzqhName(sysDeptJlMapper.getXzqhNames(r.getXzqhId())));
+        res.forEach(r -> r.setXzqhName(SysDeptJlUtils.getDeptCache(r.getXzqhId())));
         return res;
     }
 
@@ -81,7 +82,7 @@ public class ZwywXmsbJgjsServiceImpl implements IZwywXmsbJgjsService
         }
 //        zwywXmsbJgjs.setCreateUnit(SecurityUtils.getUserUnitId());
         List<ZwywXmsbJgjs> res = zwywXmsbJgjsMapper.selectShList(zwywXmsbJgjs);
-        res.forEach(r -> r.setXzqhName(sysDeptJlMapper.getXzqhNames(r.getXzqhId())));
+        res.forEach(r -> r.setXzqhName(SysDeptJlUtils.getDeptCache(r.getXzqhId())));
         return res;
     }
 

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/impl/ZwywXmsbXmlxServiceImpl.java

@@ -12,7 +12,8 @@ import com.ruoyi.business.mapper.ZwywXmsbXmlxMapper;
 import com.ruoyi.business.service.IZwywXmsbXmlxService;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.enums.DataStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -51,7 +52,7 @@ public class ZwywXmsbXmlxServiceImpl implements IZwywXmsbXmlxService
     {
         ZwywXmsbXmlx res = zwywXmsbXmlxMapper.selectById(id);
         if (StringUtils.isNotEmpty(res.getZyXzqh())) {
-            res.setXzqhName(sysDeptJlMapper.getXzqhNames(res.getZyXzqh()));
+            res.setXzqhName(SysDeptJlUtils.getDeptCache(res.getZyXzqh()));
         }
         return res;
     }
@@ -66,7 +67,7 @@ public class ZwywXmsbXmlxServiceImpl implements IZwywXmsbXmlxService
     public List<ZwywXmsbXmlx> selectZwywXmsbXmlxList(ZwywXmsbXmlx zwywXmsbXmlx)
     {
         List<ZwywXmsbXmlx> res = zwywXmsbXmlxMapper.selectList(new LambdaQueryWrapper<>(zwywXmsbXmlx));
-        res.forEach(r -> r.setXzqhName(sysDeptJlMapper.getXzqhNames(r.getZyXzqh())));
+        res.forEach(r -> r.setXzqhName(SysDeptJlUtils.getDeptCache(r.getZyXzqh())));
         return res;
     }
 

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/impl/ZwywXmsbYldyServiceImpl.java

@@ -7,7 +7,8 @@ import com.ruoyi.business.service.IZwywXmsbYldyService;
 import com.ruoyi.common.security.utils.AmountUtils;
 import com.ruoyi.system.api.enums.ScriptStatus;
 import com.ruoyi.system.api.enums.XmsbYldyStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -42,7 +43,7 @@ public class ZwywXmsbYldyServiceImpl implements IZwywXmsbYldyService
     public ZwywXmsbYldy selectZwywXmsbYldyById(String id)
     {
         ZwywXmsbYldy res = zwywXmsbYldyMapper.selectById(id);
-        res.setXzqhName(sysDeptJlMapper.getXzqhNames(res.getXzqhId()));
+        res.setXzqhName(SysDeptJlUtils.getDeptCache(res.getXzqhId()));
         res.setXzqhId(sysDeptJlMapper.getXzqhCodes(res.getXzqhId()));
         return res;
     }
@@ -58,7 +59,7 @@ public class ZwywXmsbYldyServiceImpl implements IZwywXmsbYldyService
     {
         LambdaQueryWrapper<ZwywXmsbYldy> lqw = new LambdaQueryWrapper<>(zwywXmsbYldy);
         List<ZwywXmsbYldy> res = zwywXmsbYldyMapper.selectList(lqw);
-        res.forEach(r -> r.setXzqhName(sysDeptJlMapper.getXzqhNames(r.getXzqhId())));
+        res.forEach(r -> r.setXzqhName(SysDeptJlUtils.getDeptCache(r.getXzqhId())));
         return res;
     }
 
@@ -91,7 +92,7 @@ public class ZwywXmsbYldyServiceImpl implements IZwywXmsbYldyService
 //                    r.setEditFlg(ExamineStatus.SYES.getCode());
 //                }
 //            }
-            r.setXzqhName(sysDeptJlMapper.getXzqhNames(r.getXzqhId()));
+            r.setXzqhName(SysDeptJlUtils.getDeptCache(r.getXzqhId()));
         });
         return res;
     }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/DjpdSqController.java

@@ -28,7 +28,8 @@ import com.ruoyi.system.api.enums.SysDeptJlStatus;
 import com.ruoyi.system.api.enums.WhetherStatus;
 import com.ruoyi.system.domain.SysDjpdzbJbpz;
 import com.ruoyi.system.domain.vo.TaskVo;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.mapper.SysDjpdzbJbpzMapper;
 import com.ruoyi.system.utils.SubCodeUtil;
 import com.ruoyi.system.validate.group.AddGroup;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/YljgKhJbxxController.java

@@ -34,6 +34,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+;
+
 /**
  * 养老机构_客户_基本信息Controller
  *

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgzzServiceImpl.java

@@ -6,7 +6,8 @@ import com.ruoyi.business.mapper.ZwywBtglJgzzMapper;
 import com.ruoyi.business.service.IZwywBtglJgzzService;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,7 +44,7 @@ public class ZwywBtglJgzzServiceImpl implements IZwywBtglJgzzService
         hcxx.put("hcjg", res.getHcjg());
         hcxx.put("hcyj", res.getHcyj());
         hcxxList.add(hcxx);
-        res.setXzqhNames(sysDeptJlMapper.getXzqhNames(res.getSzxzqh()));
+        res.setXzqhNames(SysDeptJlUtils.getDeptCache(res.getSzxzqh()));
         res.setHcxx(hcxxList);
         return res;
     }
@@ -75,7 +76,7 @@ public class ZwywBtglJgzzServiceImpl implements IZwywBtglJgzzService
             }
         }
         List<ZwywBtglJgzz> res = zwywBtglJgzzMapper.selectList(lqw);
-        res.forEach(r -> r.setXzqhNames(sysDeptJlMapper.getXzqhNames(r.getSzxzqh())));
+        res.forEach(r -> r.setXzqhNames(SysDeptJlUtils.getDeptCache(r.getSzxzqh())));
         return res;
     }
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtxxZfgmServiceImpl.java

@@ -35,7 +35,7 @@ public class ZwywBtxxZfgmServiceImpl implements IZwywBtxxZfgmService
     public ZwywBtxxZfgm selectZwywBtxxZfgmById(String id)
     {
         ZwywBtxxZfgm res = zwywBtxxZfgmMapper.selectById(id);
-//        res.setXzqh(sysDeptJlMapper.getXzqhNames(res.getXzqh()));
+//        res.setXzqh(SysDeptJlUtils.getDeptCache(res.getXzqh()));
         return res;
     }
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBzglXjdwglServiceImpl.java

@@ -4,7 +4,8 @@ import com.ruoyi.business.domain.ZwywBzglXjdwgl;
 import com.ruoyi.business.mapper.ZwywBzglXjdwglMapper;
 import com.ruoyi.business.service.IZwywBzglXjdwglService;
 import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,7 +38,7 @@ public class ZwywBzglXjdwglServiceImpl implements IZwywBzglXjdwglService
     public ZwywBzglXjdwgl selectZwywBzglXjdwglById(String id)
     {
         ZwywBzglXjdwgl res = zwywBzglXjdwglMapper.selectById(id);
-        res.setXzqhName(sysDeptJlMapper.getXzqhNames(res.getXzqh()));
+        res.setXzqhName(SysDeptJlUtils.getDeptCache(res.getXzqh()));
         res.setXzqh(sysDeptJlMapper.getXzqhCodes(res.getXzqh()));
         return res;
     }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBzglXjgrglServiceImpl.java

@@ -4,7 +4,8 @@ import com.ruoyi.business.domain.ZwywBzglXjgrgl;
 import com.ruoyi.business.mapper.ZwywBzglXjgrglMapper;
 import com.ruoyi.business.service.IZwywBzglXjgrglService;
 import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,7 +38,7 @@ public class ZwywBzglXjgrglServiceImpl implements IZwywBzglXjgrglService
     public ZwywBzglXjgrgl selectZwywBzglXjgrglById(String id)
     {
         ZwywBzglXjgrgl res = zwywBzglXjgrglMapper.selectById(id);
-        res.setXzqhNames(sysDeptJlMapper.getXzqhNames(res.getXzqh()));
+        res.setXzqhNames(SysDeptJlUtils.getDeptCache(res.getXzqh()));
         res.setXzqh(sysDeptJlMapper.getXzqhCodes(res.getXzqh()));
         return res;
     }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywJgBnServiceImpl.java

@@ -13,7 +13,8 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.organization.mapper.YljgJcxxMapper;
 import com.ruoyi.system.api.enums.DocumentTypeStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.IDCardUtil;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.BeanUtils;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywJgTsjbServiceImpl.java

@@ -5,7 +5,8 @@ import com.ruoyi.business.mapper.ZwywJgTsjbMapper;
 import com.ruoyi.business.service.IZwywJgTsjbService;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywJgXzcfServiceImpl.java

@@ -6,7 +6,8 @@ import com.ruoyi.business.service.IZwywJgXzcfService;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywZhjgBzssqkServiceImpl.java

@@ -4,7 +4,8 @@ import com.ruoyi.business.domain.ZwywZhjgBzssqk;
 import com.ruoyi.business.mapper.ZwywZhjgBzssqkMapper;
 import com.ruoyi.business.service.IZwywZhjgBzssqkService;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,7 +36,7 @@ public class ZwywZhjgBzssqkServiceImpl implements IZwywZhjgBzssqkService
     public ZwywZhjgBzssqk selectZwywZhjgBzssqkById(String id)
     {
         ZwywZhjgBzssqk zwywZhjgBzssqk = zwywZhjgBzssqkMapper.selectZwywZhjgBzssqkById(id);
-        zwywZhjgBzssqk.setSzxzqhName(sysDeptJlMapper.getXzqhNames(zwywZhjgBzssqk.getSzxzqh()));
+        zwywZhjgBzssqk.setSzxzqhName(SysDeptJlUtils.getDeptCache(zwywZhjgBzssqk.getSzxzqh()));
         zwywZhjgBzssqk.setSzxzqh(sysDeptJlMapper.getXzqhCodes(zwywZhjgBzssqk.getSzxzqh()));
         return zwywZhjgBzssqk;
     }
@@ -51,7 +52,7 @@ public class ZwywZhjgBzssqkServiceImpl implements IZwywZhjgBzssqkService
     {
         List<ZwywZhjgBzssqk> zwywZhjgBzssqks = zwywZhjgBzssqkMapper.selectZwywZhjgBzssqkList(zwywZhjgBzssqk);
         zwywZhjgBzssqks.forEach(z ->{
-            z.setSzxzqhName(sysDeptJlMapper.getXzqhNames(z.getSzxzqh()));
+            z.setSzxzqhName(SysDeptJlUtils.getDeptCache(z.getSzxzqh()));
             z.setTjrq(z.getCreateTimeStr().substring(0,8));z.setCreateUnitName(z.getUpdateUnitName());
             z.setHsbm(SecurityUtils.getUserUnitName());
         } );

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/service/impl/YljgJcxxServiceImpl.java

@@ -19,7 +19,8 @@ import com.ruoyi.system.api.RemoteSysConfigService;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.enums.DocumentTypeStatus;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.IDCardUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/service/impl/YljgsqJcxxServiceImpl.java

@@ -19,7 +19,8 @@ import com.ruoyi.organization.service.IYljgsqJcxxService;
 import com.ruoyi.system.api.RemoteSysConfigService;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.utils.IDCardUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/domain/YljgKhJbxx.java

@@ -67,7 +67,7 @@ public class YljgKhJbxx extends BaseEntity
     private String csrq;
 
     /** 身份证件类型（C0015） */
-    @Excel(name = "身份证件类型")
+    @Excel(name = "身份证件类型", dictType = "C0015")
     @ApiModelProperty(value = "身份证件类型（C0015）", required = true)
     @NotBlank(message = "{身份证件类型}",groups = AddGroup.class)
     @DictV(type = "C0015",message = "{身份证件类型}")
@@ -82,28 +82,28 @@ public class YljgKhJbxx extends BaseEntity
     private String zjhm;
 
     /** 民族（C0009） */
-    @Excel(name = "民族")
+    @Excel(name = "民族", dictType = "C0009")
     @ApiModelProperty(value = "民族（C0009）", required = true)
     @NotBlank(message = "{民族}",groups = AddGroup.class)
     @DictV(type = "C0009",message = "{民族}")
     private String mz;
 
     /** 国籍（XZ002） */
-    @Excel(name = "国籍")
+    @Excel(name = "国籍", dictType = "XZ002")
     @ApiModelProperty(value = "国籍（XZ002）", required = true)
     @NotBlank(message = "{国籍}",groups = AddGroup.class)
     @DictV(type = "XZ002",message = "{国籍}")
     private String gj;
 
     /** 户籍类别（C0031） */
-    @Excel(name = "户籍类别")
+    @Excel(name = "户籍类别", dictType = "C0031")
     @ApiModelProperty(value = "户籍类别（C0031）", required = true)
     @NotBlank(message = "{户籍类别}",groups = AddGroup.class)
     @DictV(type = "C0031",message = "{户籍类别}")
     private String hjlb;
 
     /** 婚姻状况（C0010） */
-    @Excel(name = "婚姻状况")
+    @Excel(name = "婚姻状况", dictType = "C0010")
     @ApiModelProperty(value = "婚姻状况（C0010）", required = true)
     @NotBlank(message = "{婚姻状况}",groups = AddGroup.class)
     @DictV(type = "C0010",message = "{婚姻状况}")
@@ -233,7 +233,7 @@ public class YljgKhJbxx extends BaseEntity
     private String yblb;
 
     /** 身体能力评估等级（CZ036） */
-    @Excel(name = "身体能力评估等级")
+    @Excel(name = "身体能力评估等级", dictType = "CZ036")
     @ApiModelProperty(value = "身体能力评估等级（CZ036）", required = true)
     @NotBlank(message = "{身体能力评估等级}",groups = AddGroup.class)
     @DictV(type = "CZ036",message = "{身体能力评估等级}")
@@ -293,7 +293,7 @@ public class YljgKhJbxx extends BaseEntity
     private String xzqhId;
 
     /** 人员状态（C0034） */
-    @Excel(name = "人员状态")
+    @Excel(name = "人员状态", dictType = "C0034")
     @ApiModelProperty(value = "人员状态（C0034）", required = true)
     @DictV(type = "C0034",message = "{人员状态}")
     private String ryzt;

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhJbxxServiceImpl.java

@@ -23,7 +23,8 @@ import com.ruoyi.system.api.enums.DataStatus;
 import com.ruoyi.system.api.enums.ResultStatus;
 import com.ruoyi.system.api.enums.WhetherStatus;
 import com.ruoyi.system.domain.SysDeptJl;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,7 +102,7 @@ public class YljgKhJbxxServiceImpl implements IYljgKhJbxxService
         }
         res.setRzdjxx(rzxxList);
         // 五级行政区划
-        res.setXjdxzqy(sysDeptJlMapper.getXzqhNames(res.getXzqhId()));
+        res.setXjdxzqy(SysDeptJlUtils.getDeptCache(res.getXzqhId()));
         res.setXzqhId(sysDeptJlMapper.getXzqhCodes(res.getXzqhId()));
         return res;
     }
@@ -262,7 +263,7 @@ public class YljgKhJbxxServiceImpl implements IYljgKhJbxxService
         res.setPgjlxx(yljgKhJbxxMapper.selectBusinessNlpgList(nlpgQuery));
         // 五级行政区划
         res.setXzqhName(sysDeptJlMapper.getXzqhIds(res.getXzqhId()));
-        res.setXjdxzqy(sysDeptJlMapper.getXzqhNames(res.getXzqhId()));
+        res.setXjdxzqy(SysDeptJlUtils.getDeptCache(res.getXzqhId()));
         return res;
     }
 
@@ -282,7 +283,7 @@ public class YljgKhJbxxServiceImpl implements IYljgKhJbxxService
             } catch (Exception e) {
                 r.setAge("0岁");
             }
-            r.setXjdxzqy(sysDeptJlMapper.getXzqhNames(r.getXjdxzqy()));
+            r.setXjdxzqy(SysDeptJlUtils.getDeptCache(r.getXjdxzqy()));
         });
         return res;
     }
@@ -311,7 +312,7 @@ public class YljgKhJbxxServiceImpl implements IYljgKhJbxxService
                 String szxzqh = r.getJgmc().substring(r.getJgmc().indexOf("%%") + 2);
                 r.setJgmc(jgmc);
                 if (StringUtils.isNotEmpty(szxzqh)) {
-                    r.setXzqhId(sysDeptJlMapper.getXzqhNames(szxzqh));
+                    r.setXzqhId(SysDeptJlUtils.getDeptCache(szxzqh));
                 }
             }
         });
@@ -347,7 +348,7 @@ public class YljgKhJbxxServiceImpl implements IYljgKhJbxxService
                 String szxzqh = r.getJgmc().substring(r.getJgmc().indexOf("%%") + 2);
                 r.setJgmc(jgmc);
                 if (StringUtils.isNotEmpty(szxzqh)) {
-                    r.setXzqhId(sysDeptJlMapper.getXzqhNames(szxzqh));
+                    r.setXzqhId(SysDeptJlUtils.getDeptCache(szxzqh));
                 }
             }
         });
@@ -375,7 +376,7 @@ public class YljgKhJbxxServiceImpl implements IYljgKhJbxxService
             } catch (Exception e) {
                 r.setAge("0岁");
             }
-            r.setXjdxzqy(sysDeptJlMapper.getXzqhNames(r.getXjdxzqy()));
+            r.setXjdxzqy(SysDeptJlUtils.getDeptCache(r.getXjdxzqy()));
         });
         return res;
     }

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhJbxxMapper.xml

@@ -540,19 +540,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectBusinessYljgKhJbxxList" parameterType="YljgKhJbxx" resultMap="YljgKhJbxxResult">
-        <include refid="selectBusinessYljgKhJbxxVo"/>
+        select id, xb, xm, zjlx, zjhm, mz, gj, hjlb, hyzk, xjdxzqy, xjd, nlpg, ryzt from yljg_kh_jbxx FORCE INDEX (idx_rzjg)
         <where>
-            a.status = '0'
-            and a.is_rz = '1'
-            and a.create_user_type = '01'
-            <if test="xm != null  and xm != ''"> and a.xm like concat('%', #{xm}, '%')</if>
-            <if test="zjhm != null  and zjhm != ''"> and a.zjhm like concat('%', #{zjhm}, '%')</if>
-            <if test="jgmc != null  and jgmc != ''"> and b.jgmc like concat('%', #{jgmc}, '%')</if>
-            <if test="nlpg != null  and nlpg != ''"> and a.nlpg = #{nlpg}</if>
-            <if test="xjdxzqy != null  and xjdxzqy != ''"> and a.xjdxzqy = #{xjdxzqy}</if>
+            is_rz = '1'
+            AND create_user_type = '01'
+            <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
+            <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
-            <if test="isCj != null  and isCj != ''"> and a.is_cj = #{isCj}</if>
-            <if test="xzqhId != null  and xzqhId != ''"> and (b.szxzqh IN ( SELECT code FROM v_filter_xzqh WHERE code = #{xzqhId} or find_in_set( #{xzqhId} , ancestors ) ))</if>
+            <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
+            <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
+                AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh IN (
+                SELECT
+                code
+                FROM
+                sys_dept_jl
+                WHERE
+                code = #{xzqhId}
+                OR find_in_set(#{xzqhId}, ancestors)
+                ) and jgmc like concat('%', #{jgmc}, '%'))
+            </if>
+            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and jgmc like concat('%', #{jgmc}, '%'))</if>
+            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh IN (
+                SELECT
+                code
+                FROM
+                sys_dept_jl
+                WHERE
+                code = #{xzqhId}
+                OR find_in_set(#{xzqhId}, ancestors)
+                ))</if>
+            <if test="nlpg != null  and nlpg != ''"> and nlpg = #{nlpg}</if>
+            <if test='isPresent == "1"'> AND jg_id IN (select id from yljg_jcxx where sczt = '01' and ssxzqh = #{xzqhId})</if>
+            <if test="isCj != null  and isCj != ''"> and is_cj = #{isCj}</if>
+            <if test='isGbmb == "01"'> and jg_id in (select id from yljg_jcxx where sczt = '01' and dwxz in ('30','31','32','33','40','41','42','43')) </if>
+            <if test='isGbmb == "00"'> and jg_id in (select id from yljg_jcxx where sczt = '01' and dwxz in ('10','20','21','22','23')) </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and jg_id in (select id from yljg_jcxx where sczt = '01' and is_gbmy = #{isGbmy})</if>
         </where>
     </select>
 
@@ -564,18 +586,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectBusinessYljgKhJbxxSqList" parameterType="YljgKhJbxx" resultMap="YljgKhJbxxResult">
-        <include refid="selectBusinessYljgKhJbxxSqVo"/>
+        select id, xb, xm, zjlx, zjhm, mz, gj, hjlb, hyzk, xjdxzqy, xjd, nlpg, ryzt from yljg_kh_jbxx FORCE INDEX (idx_sqfw)
         <where>
-            a.status = '0'
-            and a.create_user_type = '02'
-            <if test="xm != null  and xm != ''"> and a.xm like concat('%', #{xm}, '%')</if>
-            <if test="zjhm != null  and zjhm != ''"> and a.zjhm like concat('%', #{zjhm}, '%')</if>
-            <if test="jgmc != null  and jgmc != ''"> and b.jgmc like concat('%', #{jgmc}, '%')</if>
-            <if test="xjdxzqy != null  and xjdxzqy != ''"> and a.xjdxzqy = #{xjdxzqy}</if>
+            create_user_type = '02'
+            <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
+            <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
-            <if test="nlpg != null  and nlpg != ''"> and a.nlpg = #{nlpg}</if>
-            <if test="isCj != null  and isCj != ''"> and a.is_cj = #{isCj}</if>
-            <if test="xzqhId != null  and xzqhId != ''"> and (b.szxzqh IN ( SELECT code FROM v_filter_xzqh WHERE code = #{xzqhId} or find_in_set( #{xzqhId} , ancestors ) ))</if>
+            <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
+                AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh IN (
+                SELECT
+                code
+                FROM
+                sys_dept_jl
+                WHERE
+                code = #{xzqhId}
+                OR find_in_set(#{xzqhId}, ancestors)
+                ) and jgmc like concat('%', #{jgmc}, '%'))
+            </if>
+            <if test="(jgmc != null and jgmc != '') and (xzqhId == null or xzqhId == '')"> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and jgmc like concat('%', #{jgmc}, '%'))</if>
+            <if test="(jgmc == null or jgmc == '') and (xzqhId != null and xzqhId != '')"> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh IN (
+                SELECT
+                code
+                FROM
+                sys_dept_jl
+                WHERE
+                code = #{xzqhId}
+                OR find_in_set(#{xzqhId}, ancestors)
+                ))</if>
+            <if test="nlpg != null  and nlpg != ''"> and nlpg = #{nlpg}</if>
+            <if test='isPresent == "1"'> AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh = #{xzqhId})</if>
+            <if test="isCj != null  and isCj != ''"> and is_cj = #{isCj}</if>
         </where>
     </select>
 
@@ -669,7 +709,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND create_user_type = '01'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
-            <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy = #{xjdxzqy}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
             <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
@@ -711,7 +750,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_user_type = '02'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
-            <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy = #{xjdxzqy}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
             <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
                 AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh IN (
@@ -750,7 +788,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND create_user_type = '01'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
-            <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy = #{xjdxzqy}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
             <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
@@ -793,7 +830,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_user_type = '02'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
-            <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy = #{xjdxzqy}</if>
             <if test="xjdxzqy != null  and xjdxzqy != ''"> and xjdxzqy in (select code from sys_dept_jl where code = #{xjdxzqy} or find_in_set(#{xjdxzqy}, ancestors)) </if>
             <if test="(jgmc != null and jgmc != '') and (xzqhId != null  and xzqhId != '')">
                 AND jg_id IN (select id from yljgsq_jcxx where sczt = '01' and ssxzqh IN (

ruoyi-modules/mz-system-ext/src/main/java/com/ruoyi/system/service/impl/SysDeptJlServiceImpl.java

@@ -5,7 +5,8 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.domain.SysDeptJl;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.service.ISysDeptJlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -259,7 +260,7 @@ public class SysDeptJlServiceImpl implements ISysDeptJlService {
 
     @Override
     public String getLocationName(String code) {
-        return sysDeptJlMapper.getXzqhNames(code);
+        return SysDeptJlUtils.getDeptCache(code);
     }
 
     /**

ruoyi-modules/mz-system-ext/src/main/java/com/ruoyi/system/service/impl/SysGgxxServiceImpl.java

@@ -3,7 +3,8 @@ package com.ruoyi.system.service.impl;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.domain.SysGgxx;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.mapper.SysGgxxMapper;
 import com.ruoyi.system.service.ISysGgxxService;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java

@@ -20,7 +20,8 @@ import com.ruoyi.system.db.DBExecResult;
 import com.ruoyi.system.db.DBFactory;
 import com.ruoyi.system.db.DBImpl;
 import com.ruoyi.system.db.DBResult;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.service.ISysDictTypeService;
 import com.ruoyi.system.utils.SubCodeUtil;
 import com.ruoyi.system.validate.group.AddGroup;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -12,7 +12,8 @@ import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.domain.SysDeptJl;
 import com.ruoyi.system.domain.vo.TreeSelect;
-import com.ruoyi.system.mapper.SysDeptJlMapper;
+;import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.service.ISysDeptService;

ruoyi-ui/src/views/search/xxcx/lrxx/sqfw/index.vue

@@ -918,7 +918,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/lrxxcx/export",
+        "business/lrxxcx/sq/export",
         {
           ...this.queryParams,
         },