Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -61,7 +61,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
      */
     @Override
     public List<SysDept> findTree(String deptId, String managementSource) {
-        // 获取当前操作用
+        // 获取当前操作用户
         SysUser user = BaseController.getUser();
         String userId = user.getId();
 
@@ -74,7 +74,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         //如果当前用户未配置树展示等级，则默认为查询全部
         if (Objects.isNull(treeShowLevel)) {
             treeShowLevel = new SysUserTreeShowLevel();
-            treeShowLevel.setShowLevel("all");
+            treeShowLevel.setShowLevel("subordinate");
         }
         // 如果指定的部门ID为空或特定值，则使用当前用户所在部门ID
         if (null == deptId || "".equals(deptId) || "undefined".equals(deptId)) {

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -738,10 +738,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         lambdaQueryWrapper.eq(SysUserTreeShowLevel::getUserId, userId);
         SysUserTreeShowLevel treeShowLevel = sysUserTreeShowLevelService.getOne(lambdaQueryWrapper);
 
-        //如果当前用户未配置树展示等级，则默认为查询全部
+        //如果当前用户未配置树展示等级，则默认为查询本级及以下
         if (Objects.isNull(treeShowLevel)) {
             treeShowLevel = new SysUserTreeShowLevel();
-            treeShowLevel.setShowLevel("all");
+            treeShowLevel.setShowLevel("subordinate");
         }
         //获取领导字段不为空的人的ID
         List<SysUser> users = lambdaQuery().isNotNull(SysUser::getLeaderId).list();
@@ -770,18 +770,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 buildUserTree(topUsers, users);
                 break;
             case "same": // 只展示当前用户
-                for (String ids : strings) {
-                    if (ids.equals(userId)) {
-                        topUsers.add(user);
-                    }
-                }
+//                for (String ids : strings) {
+//                    if (ids.equals(userId)) {
+                topUsers.add(user);
+//                    }
+//                }
                 break;
             case "subordinate": // 只展示当前用户及下属
-                for (String ids : strings) {
-                    if (ids.equals(userId)) {
-                        topUsers.add(user);
-                    }
-                }
+//                for (String ids : strings) {
+//                    if (ids.equals(userId)) {
+                topUsers.add(user);
+//                    }
+//                }
                 // 递归构建用户树结构
                 buildUserTree(topUsers, users);
                 break;
@@ -1022,7 +1022,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private boolean exists(List<QuUserNum> quUserNums, SysArea sysArea) {
         boolean exist = true;
         for (QuUserNum quUserNum1 : quUserNums) {
-            if (quUserNum1.getAreaName().equals(sysArea.getAreaCname())) {
+            if (sysArea.getAreaCname().equals(quUserNum1.getAreaName())) {
                 exist = false;
                 break;
             }

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -263,9 +263,9 @@ public class RuleAttrMappingVo {
         //商业续保
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyRenewal", insAreaCompany.getSyRenewal()));
         // 交强出险次数
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqNumberOfClaims", insAreaCompany.getJqClaims()));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqNumberOfClaims", insAreaCompany.getJqClaims() == null ? "0" : insAreaCompany.getJqClaims()));
         // 商业出险次数
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyNumberOfClaims", insAreaCompany.getSyClaims()));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyNumberOfClaims", insAreaCompany.getSyClaims() == null ? "0" : insAreaCompany.getSyClaims()));
         return ruleAttrMappingVoList;
     }
 }