Revert "负责人可赋值为空"

This reverts commit 233f3539ff2ad68ef4ae0584dd1b9584e9697633.

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -29,7 +29,6 @@ import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysDeptService;
@@ -563,19 +562,19 @@ public class FlowProcessServiceImpl implements FlowProcessService {
                 }
                 // 部门负责人
                 if (HandleObjectTypeEnum.DETP_LEADER.equals(handleObjectTypeEnum)) {
-                    String leaderId = sysDept.getLeaderId();
+                    Long leaderId = sysDept.getLeaderId();
                     if (leaderId == null) {
                         throw new ServiceException("部门负责人为空");
                     }
-                    flowResult.setUserId(Convert.toLong(leaderId));
+                    flowResult.setUserId(leaderId);
                 }
                 // 部门总监
                 else {
-                    String directorId = sysDept.getDirectorId();
+                    Long directorId = sysDept.getDirectorId();
                     if (directorId == null) {
                         throw new ServiceException("部门总监为空");
                     }
-                    flowResult.setUserId(Convert.toLong(directorId));
+                    flowResult.setUserId(directorId);
                 }
                 flowResult.setSuccess(true);
                 return flowResult;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -53,12 +53,12 @@ public class SysDept extends BaseEntity {
     /**
      * 负责人id
      */
-    private String leaderId;
+    private Long leaderId;
 
     /**
      * 总监id
      */
-    private String directorId;
+    private Long directorId;
 
     /**
      * 联系电话
@@ -145,19 +145,19 @@ public class SysDept extends BaseEntity {
         this.orderNum = orderNum;
     }
 
-    public String getLeaderId() {
+    public Long getLeaderId() {
         return leaderId;
     }
 
-    public void setLeaderId(String leaderId) {
+    public void setLeaderId(Long leaderId) {
         this.leaderId = leaderId;
     }
 
-    public String getDirectorId() {
+    public Long getDirectorId() {
         return directorId;
     }
 
-    public void setDirectorId(String directorId) {
+    public void setDirectorId(Long directorId) {
         this.directorId = directorId;
     }