列严信用修复允许上级办理下级业务

src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java

@@ -1057,21 +1057,45 @@ public class BizSerIllegalRemController extends BaseController implements Servle
     @RequestMapping(value = "/creditValidateBiz.do", method = RequestMethod.POST)
     public RestResult<?> creditValidateBiz(HttpServletRequest request, String illegallistids) {
         AICUser aicUser = getLoginUser(request);
-        if (aicUser == null) return RestResult.error(ResultCode.USER_NOT_LOGGED_IN);
+        if (aicUser == null) {
-        String userOrg = org.apache.commons.lang.StringUtils.substring(aicUser.getRegionID(), 0, 6);
+            return RestResult.error(ResultCode.USER_NOT_LOGGED_IN);
+        }
 
         Map<String, String> resultMap = new HashMap<>();
         List<Map<String, String>> list = new ArrayList<>();
+        //这一步进行判断，且允许上级办理下级的信用修复
+        Map<String, String> map = new HashMap<>();
+        map.put("orgNumber", aicUser.getRegionID());
+        map.put("deleted", "0");
+        map.put("unittype", "1");
+        OrgUnits org = aicorgService.queryByOrgNumberMap(map);
+        boolean isSame = true;
 
+        if (org != null) {
             String[] illegallistidArr = illegallistids.split(Constant.SEMICOLON);
             for (String illegallistid : illegallistidArr) {
                 TSSerIllegalList serIllegalListModel = tsSerIllegalListService.getById(illegallistid);
-            String unitCode = gzaiccodeService.changeUnitCn(serIllegalListModel.getDecorg(), serIllegalListModel.getDecorgCn());
+                Integer orgLevel = org.getOrgLevel();
-            if(StringUtils.isNotBlank(unitCode) && !userOrg.equals(unitCode)){
+                //根据机构等级判断
-                LambdaQueryWrapper<EBaseinfo> wrapper = new LambdaQueryWrapper<>();
+                if (orgLevel == 1) {    //省局
-                wrapper.eq(EBaseinfo::getPripid, serIllegalListModel.getPripid());
+                    isSame = com.chinaweal.aiccs.common.util.StringUtils.equals(
-                EBaseinfo eBaseinfo = eBaseinfoService.getOne(wrapper);
+                            StringUtils.substring(aicUser.getRegionID(), 0, 2),
-                if(!userOrg.equals(StringUtils.substring(eBaseinfo.getRegorg(),0,6))){
+                            StringUtils.substring(serIllegalListModel.getDecorg(), 0, 2));
+                } else if (orgLevel == 2) {    //市局
+                    isSame = com.chinaweal.aiccs.common.util.StringUtils.equals(
+                            StringUtils.substring(aicUser.getRegionID(), 0, 4),
+                            StringUtils.substring(serIllegalListModel.getDecorg(), 0, 4));
+                } else if (orgLevel == 3) {    //区局
+                    isSame = com.chinaweal.aiccs.common.util.StringUtils.equals(
+                            StringUtils.substring(aicUser.getRegionID(), 0, 6),
+                            StringUtils.substring(serIllegalListModel.getDecorg(), 0, 6));
+                } else if (orgLevel >= 4) {    //所
+                    isSame = com.chinaweal.aiccs.common.util.StringUtils.equals(
+                            StringUtils.substring(aicUser.getRegionID(), 0, 6),
+                            StringUtils.substring(serIllegalListModel.getDecorg(), 0, 6));
+                }
+
+                if(!isSame){
                     resultMap.put("regno", serIllegalListModel.getRegno());
                     resultMap.put("entname", serIllegalListModel.getEntname());
                     resultMap.put("pripid", serIllegalListModel.getPripid());
@@ -1080,7 +1104,6 @@ public class BizSerIllegalRemController extends BaseController implements Servle
                     list.add(resultMap);
                     return RestResult.ok(list);
                 }
-            }
 
                 String validateResult = this.validate(illegallistid);
                 int days = (int) ((int)LocalDate.now().toEpochDay() - serIllegalListModel.getAbntime().toEpochDay());
@@ -1093,7 +1116,6 @@ public class BizSerIllegalRemController extends BaseController implements Servle
 //            }
 
                 if (!"success".equals(validateResult)) {
-
                     resultMap.put("regno", serIllegalListModel.getRegno());
                     resultMap.put("entname", serIllegalListModel.getEntname());
                     resultMap.put("pripid", serIllegalListModel.getPripid());
@@ -1102,6 +1124,9 @@ public class BizSerIllegalRemController extends BaseController implements Servle
                     list.add(resultMap);
                 }
             }
+        } else {
+            return RestResult.error(ResultCode.MYSTERIOUS_ERROR, "当前用户所属机关不存在");
+        }
         if (CollectionUtils.isNotEmpty(list)) return RestResult.ok(list);
 
         return OK;

src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalServiceImpl.java

@@ -641,7 +641,8 @@ public class TSBizSerIllegalServiceImpl extends BaseServiceImpl<TSBizSerIllegall
         tsSerIllegalList.setIntoSponsorIllegalId(user.getPrimaryKey());
         tsSerIllegalList.setBatchAndCase(dbTSBizSerIllegal.getBatchAndCase());
         tsSerIllegalList.setOperationStatus("0");
-        tsSerIllegalList.setAreaCode("440100"); // 统一设置为440100
+        String areaCode = tsBizSerIllegal.getDecorg();
+        tsSerIllegalList.setAreaCode(StringUtils.isEmpty(areaCode)?"150000":areaCode.substring(0,6));
         tsSerIllegalList.setIsshow("1");
         tsSerIllegalList.setDecorg(orgUnits.getOrgNumber());
         tsSerIllegalList.setDecorgCn(orgUnits.getOrgUnitName());// 列入决定机关中文