Merge branch 'ww'

src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java

@@ -107,11 +107,15 @@ public class ThrDeptController {
             thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity);
         }
             //判断部门是否存在
-        filterThrDeptRequest.setCode(thrDeptEntity.getCode());
+
         filterThrDeptRequest.setName(thrDeptEntity.getName());
         filterThrDeptRequest.setThirdSysFk(thrDeptEntity.getThirdSysFk());
+        filterThrDeptRequest.setStatus(thrDeptEntity.getStatus());
         List<ThrDeptEntity> thrDeptEntities = thrDeptService.filterThrInvWarehouse(filterThrDeptRequest);
-        if(thrDeptEntities.size()==0){
+        filterThrDeptRequest.setCode(thrDeptEntity.getCode());
+        filterThrDeptRequest.setName(null);
+        List<ThrDeptEntity> thrDeptEntities1= thrDeptService.filterThrInvWarehouse(filterThrDeptRequest);
+        if(thrDeptEntities.size()==0 && thrDeptEntities1.size()==0){
             thrDeptEntity.setPid(null); // 不能修改父级 pid
             thrDeptEntity.setUpdateTime(new Date());
             boolean b = thrDeptService.updateInvWarehouse(thrDeptEntity);

src/main/java/com/glxp/api/req/thrsys/FilterThrDeptRequest.java

@@ -16,6 +16,7 @@ public class FilterThrDeptRequest extends ListPageRequest {
     private Boolean isDefault;
     private Date updateTime;
     private String key;
+    private Integer status;
     private String pcode;
     private Integer level;
 

src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml

@@ -38,6 +38,9 @@
             <if test="thirdSysFk != null">
                 and thirdSysFk = #{thirdSysFk}
             </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
         </where>
     </select>