Merge branch '陈航-修改文档问题-3' of sckj/mz-cloud into master

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

@@ -62,7 +62,7 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
     public Map<String,Object> selectYljgTj()
     {
         Map<String,Object> res = new HashMap<>();
-        res.put("yljg", gztMapper.selectYljg(SecurityUtils.getUserUnitId()));
+        res.put("yljg", gztMapper.selectYljg(SecurityUtils.getUserToUnitId()));
         return res;
     }
 
@@ -70,7 +70,7 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
     @Override
     public Map<String, Object> selectSqylTj() {
         Map<String,Object> res = new HashMap<>();
-        res.put("sqylfwjghss", gztMapper.selectYljgSq(SecurityUtils.getUserUnitId()));
+        res.put("sqylfwjghss", gztMapper.selectYljgSq(SecurityUtils.getUserToUnitId()));
         return res;
     }
 
@@ -78,7 +78,7 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
     @Override
     public Map<String, Object> selectDbTj() {
         Map<String,Object> res = new HashMap<>();
-        Map<String,Object> wddb = gztMapper.selectWddb(SecurityUtils.getUserUnitId());
+        Map<String,Object> wddb = gztMapper.selectWddb(SecurityUtils.getUserToUnitId());
         wddb.put("djpd", gztMapper.selectDjpdDbCount(String.valueOf(SecurityUtils.getUserId())));
         res.put("wddb", wddb);
         return res;
@@ -169,7 +169,7 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
         Map<String,Object> res = new HashMap<>();
         String level = ssMap.get("level");
         if ("3".equals(level)) {
-            res.put("YljgYyztTj", gztMapper.selectYljgYyztTjQx(SecurityUtils.getUserUnitId()));
+            res.put("YljgYyztTj", gztMapper.selectYljgYyztTjQx(SecurityUtils.getUserToUnitId()));
         } else {
             res.put("YljgYyztTj", gztMapper.selectYljgYyztTj(SecurityUtils.getAreaCode()));
         }
@@ -182,7 +182,7 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
         Map<String, Object> res = new HashMap<>();
         String level = ssMap.get("level");
         if ("3".equals(level)) {
-            res.put("YljgSqYyztTj", gztMapper.selectYljgSqYyztTjQx(SecurityUtils.getUserUnitId()));
+            res.put("YljgSqYyztTj", gztMapper.selectYljgSqYyztTjQx(SecurityUtils.getUserToUnitId()));
         } else {
             res.put("YljgSqYyztTj", gztMapper.selectYljgSqYyztTj(SecurityUtils.getAreaCode()));
         }

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgJcxxMapper.xml

@@ -937,7 +937,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ssxzqh != null  and ssxzqh != ''"> and ssxzqh IN ( SELECT CODE FROM SYS_DEPT_JL WHERE FIND_IN_SET(#{ssxzqh},ancestors) OR CODE = #{ssxzqh} )</if>
             <if test="tyshxydm != null  and tyshxydm != ''"> and tyshxydm like concat('%', #{tyshxydm}, '%')</if>
             <if test="isBa != null  and isBa != ''"> and is_ba = #{isBa}</if>
-            --             <if test="sczt != null  and sczt != ''"> and sczt = #{sczt}</if>
             <if test="yljglx != null  and yljglx != ''"> and get_yljg_jglx(dwxz,frlx) = #{yljglx}</if>
         </where>
     </select>