修改bug

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -115,24 +115,26 @@ public class TOrganController extends BaseController {
 
         try {
             TOrgan byId = tOrganService.selectById(tOrgan.getId());
-            if (!byId.getParentId().equals(tOrgan.getParentId())) {
-                tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
+            if (StringUtils.isNotBlank(tOrgan.getParentId())) {
+                if (!byId.getParentId().equals(tOrgan.getParentId())) {
+                    tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
+                }
+                if (byId.getLevel() != tOrgan.getCode().length() / 3 && byId.getChildren().size() > 0) {
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("resultCode", "500");
+                    map.put("message", "机构存在下级机构，不能修改机构级别！");
+                    map.put("data", "");
+                    return map;
+                }
+                tOrgan.setLevel(tOrgan.getCode().length() / 3);
+                if (tOrgan.getLevel() > 3) {
+                    HashMap<String, Object> resultMap = new HashMap<>();
+                    resultMap.put("resultCode", "500");
+                    resultMap.put("message", "不能修改机构为4级！");
+                    return resultMap;
+                }
             }
-            if (byId.getLevel() != tOrgan.getCode().length() / 3 && byId.getChildren().size() > 0) {
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("resultCode", "500");
-                map.put("message", "机构存在下级机构，不能修改机构级别！");
-                map.put("data", "");
-                return map;
-            }
-            tOrgan.setLevel(tOrgan.getCode().length() / 3);
             tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
-            if (tOrgan.getLevel() > 3) {
-                HashMap<String, Object> resultMap = new HashMap<>();
-                resultMap.put("resultCode", "500");
-                resultMap.put("message", "不能修改机构为4级！");
-                return resultMap;
-            }
             boolean flag = false;
             flag = tOrganService.updateById(tOrgan);
             if (!flag) {