更新修改部门信息需要先判断是否有人员

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkUserMapper.java

@@ -31,4 +31,7 @@ public interface XhpcWorkUserMapper {
 
     String selectPhoneListByIds(@Param("userIds")String userIds);
 
+
+    List<XhpcWorkUserDomain> selectListByDeptId(@Param("deptId")Long deptId);
+
 }

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkUserService.java

@@ -1,6 +1,5 @@
 package com.xhpc.activity.service;
 
-import com.xhpc.activity.domain.XhpcWorkDeptDomain;
 import com.xhpc.activity.domain.XhpcWorkUserDomain;
 import com.xhpc.activity.vo.SysUserResetPasswordVo;
 
@@ -36,4 +35,6 @@ public interface WorkUserService {
     Object updateDomainStatus(XhpcWorkUserDomain domain);
 
     String getPhoneListByUserIds(String userIds);
+
+    List<XhpcWorkUserDomain> getUserListByDeptId(Long deptId);
 }

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java

@@ -1,8 +1,10 @@
 package com.xhpc.activity.service.impl;
 
 import com.xhpc.activity.domain.XhpcWorkDeptDomain;
+import com.xhpc.activity.domain.XhpcWorkUserDomain;
 import com.xhpc.activity.mapper.XhpcWorkDeptMapper;
 import com.xhpc.activity.service.WorkDeptService;
+import com.xhpc.activity.service.WorkUserService;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
 import org.springframework.stereotype.Service;
@@ -20,6 +22,9 @@ public class WorkDeptServiceImpl implements WorkDeptService {
     @Resource
     XhpcWorkDeptMapper deptMapper;
 
+    @Resource
+    WorkUserService workUserService;
+
     @Override
     public List<XhpcWorkDeptDomain> getPage(Map<String, Object> params){
         return deptMapper.selectListByParams(params);
@@ -75,6 +80,13 @@ public class WorkDeptServiceImpl implements WorkDeptService {
 
     @Override
     public Boolean updateDomain(XhpcWorkDeptDomain domain){
+        XhpcWorkDeptDomain deptDomain = deptMapper.selectByPrimaryKey(domain.getWorkDeptId());
+        if(!deptDomain.getType().equals(domain.getType())){
+            List<XhpcWorkUserDomain> userDomainList = workUserService.getUserListByDeptId(deptDomain.getWorkDeptId());
+            if(userDomainList.size()> 0){
+                throw new CustomException("部门已存在人员");
+            }
+        }
         return deptMapper.updateByPrimaryKey(domain) > 0;
     }
 

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java

@@ -230,6 +230,12 @@ public class WorkUserServiceImpl implements WorkUserService {
     }
 
 
+    @Override
+    public List<XhpcWorkUserDomain> getUserListByDeptId(Long deptId){
+        return workUserMapper.selectListByDeptId(deptId);
+    }
+
+
     private void getUserConvert(SysUser user, XhpcWorkUserDomain domain){
         user.setUserName(domain.getLoginName());
         user.setNickName(domain.getUserName());

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoProcessOrderTask.java

@@ -1,6 +1,7 @@
 package com.xhpc.activity.task;
 
 
+import com.alibaba.fastjson.JSON;
 import com.xhpc.activity.domain.XhpcWorkOrderDomain;
 import com.xhpc.activity.domain.XhpcWorkTypeDictDomain;
 import com.xhpc.activity.mapper.XhpcWorkOrderMapper;
@@ -62,6 +63,10 @@ public class AutoProcessOrderTask {
                     break;
             }
 
+            System.out.println(" ===================== 运维自动措施执行 =====================");
+            System.out.println(JSON.toJSONString(orderDomain));
+            System.out.println(JSON.toJSONString(r));
+
             if (r != null && r.getCode() == 200) {
                 orderDomain.setStatus(Short.parseShort("2"));
                 orderDomain.setDisposalMethod("运维系统执行自动处理措施：" + processStr);

xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml

@@ -166,4 +166,13 @@
     <select id="selectPhoneListByIds" resultType="java.lang.String">
       SELECT GROUP_CONCAT(phone) from xhpc_work_user where find_in_set(work_user_id, #{userIds})
     </select>
+
+
+    <select id="selectListByDeptId" resultType="com.xhpc.activity.domain.XhpcWorkUserDomain">
+      select
+      <include refid="Base_Column_List" />
+      FROM xhpc_work_user u
+      WHERE u.dept_id=#{deptId} and u.del_flag=0 and u.status=1
+
+    </select>
 </mapper>