优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java

@@ -124,9 +124,9 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
                     String roleName = baseRoleletpricepowimitDetailsVo.getRoleName();
                     String letPrice = baseRoleletpricepowimitDetailsVo.getLetPrice();
                     String deptName = baseRoleletpricepowimitDetailsVo.getDeptName();
-                    if (StringUtils.isNotBlank(deptName)){
+                    if (StringUtils.isNotBlank(deptName)) {
                         roleLetPrice.append(deptName).append("-").append(roleName).append("(").append(letPrice).append(")").append("、");
-                    }else {
+                    } else {
                         roleLetPrice.append(roleName).append("(").append(letPrice).append(")").append("、");
                     }
                 }
@@ -144,7 +144,7 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         List<BaseRoleletpricepowimitDto> baseRoleletpricepowimits = dto.getBaseRoleletpricepowimits();
-        List<BaseRoleletpricepowimitDto> baseRoleletpricepowimitsNew = new ArrayList<>();
+        List<BaseRoleletpricepowimitDto> baseRoleletpricepowimitsNew = dto.getBaseRoleletpricepowimits();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
             return rb.success();
@@ -152,24 +152,25 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
         for (BaseRoleletpricepowimitDto baseRoleletpricepowimit : baseRoleletpricepowimits) {
             //判断数据库是否存在重复数据
             QueryWrapper qw = new QueryWrapper<>();
-            qw.eq("bbw.brandSid",dto.getBrandSid());
-            qw.eq("bbw.useOrgSid",dto.getUseOrgSid());
-            qw.eq("brw.deptSid",baseRoleletpricepowimit.getDeptSid());
-            qw.eq("brw.roleSid",baseRoleletpricepowimit.getRoleSid());
-            qw.ne("brw.mainSid",dtoSid);
+            qw.eq("bbw.brandSid", dto.getBrandSid());
+            qw.eq("bbw.useOrgSid", dto.getUseOrgSid());
+            qw.eq("brw.deptSid", baseRoleletpricepowimit.getDeptSid());
+            qw.eq("brw.roleSid", baseRoleletpricepowimit.getRoleSid());
+            qw.ne("brw.mainSid", dtoSid);
             int i = baseRoleletpricepowimitService.selDeptAndRoleSid(qw);
-            if (i > 0){
+            if (i > 0) {
                 return rb.setMsg("选择的关系已存在，请重新选择");
             }
-            //判断选择的数据是否重复
-            if (baseRoleletpricepowimitsNew.size() == 0){
-                baseRoleletpricepowimitsNew.add(baseRoleletpricepowimit);
-            }
-            for (BaseRoleletpricepowimitDto baseRoleletpricepowimitDto : baseRoleletpricepowimitsNew) {
-                if (baseRoleletpricepowimit.getDeptSid().equals(baseRoleletpricepowimitDto.getDeptSid()) && baseRoleletpricepowimit.getRoleSid().equals(baseRoleletpricepowimitDto.getRoleSid())){
-                    return rb.setMsg("选择的部门和角色不可重复，请重新选择");
-                }else {
-                    baseRoleletpricepowimitsNew.add(baseRoleletpricepowimit);
+        }
+        //判断选择的数据是否存在重复数据
+        for (int i = 0; i < baseRoleletpricepowimits.size(); i++) {
+            BaseRoleletpricepowimitDto baseRoleletpricepowimitDto = baseRoleletpricepowimits.get(i);
+            for (int j = i + 1; j < baseRoleletpricepowimitsNew.size(); j++) {
+                BaseRoleletpricepowimitDto baseRoleletpricepowimitDto1 = baseRoleletpricepowimitsNew.get(j);
+                if (baseRoleletpricepowimitDto1 != null){
+                    if (baseRoleletpricepowimitDto1.getDeptSid().equals(baseRoleletpricepowimitDto.getDeptSid()) && baseRoleletpricepowimitDto1.getRoleSid().equals(baseRoleletpricepowimitDto.getRoleSid())) {
+                        return rb.setMsg("选择的部门和角色不可重复，请重新选择");
+                    }
                 }
             }
         }
@@ -226,10 +227,10 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
         String orgSid = query.getOrgSid();
         String roleSid = query.getRoleSid();
         String deptSid = query.getDeptSid();
-        String moneyOne = baseMapper.getMoneyOne(brandSid, orgSid, roleSid,deptSid);
+        String moneyOne = baseMapper.getMoneyOne(brandSid, orgSid, roleSid, deptSid);
         if (StringUtils.isBlank(moneyOne)) {
             String money = baseMapper.getMoney(brandSid, orgSid, roleSid);
-            if(StringUtils.isBlank(money)){
+            if (StringUtils.isBlank(money)) {
                 return rb;
             }
             return rb.success().setData(money);