Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev

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

@@ -27,7 +27,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <pre>
@@ -56,7 +59,7 @@ public class TOrganController extends BaseController {
     public Map<String, Object> add(TOrgan organ) {
         HashMap<String, Object> resultMap = new HashMap<>();
         QueryWrapper<TOrgan> ew = new QueryWrapper<>();
-        if (StringUtils.isBlank(organ.getParentId())){
+        if (StringUtils.isBlank(organ.getParentId())) {
             organ.setParentId("0");
         }
         if (StringUtils.isNoneBlank(organ.getName().trim())) {
@@ -64,12 +67,12 @@ public class TOrganController extends BaseController {
             ew.eq("is_deleted", 0);
             ew.eq("name", organ.getName());
             List<TOrgan> list = this.tOrganService.list(ew);
-            if (list != null && list.size()>0&&list.get(0)!=null) {
+            if (list != null && list.size() > 0 && list.get(0) != null) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "机构名称不能重复！");
                 return resultMap;
             }
-        }else {
+        } else {
             resultMap.put("resultCode", "400");
             resultMap.put("message", "机构名称不能为空！");
             return resultMap;
@@ -102,6 +105,12 @@ public class TOrganController extends BaseController {
     @MethodLog(operModule = OperModule.ORG, operType = OperType.UPDATE)
     public Map<String, Object> updateTOrgan(TOrgan tOrgan) {
         try {
+            if (tOrgan.getParentId() != null && tOrgan.getId() != null && tOrgan.getId().equals(tOrgan.getParentId())) {
+                HashMap<String, Object> resultMap = new HashMap<>(2);
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "父级机构不能是自己！");
+                return resultMap;
+            }
             if (StringUtils.isBlank(tOrgan.getName().trim())) {
                 HashMap<String, Object> resultMap = new HashMap<>();
                 resultMap.put("resultCode", "400");