BUG修复

mailbox-lan/src/main/java/com/biutag/lan/flow/node/FirstApprovalFlow.java

@@ -114,6 +114,7 @@ public class FirstApprovalFlow extends Flow {
         // 更新信件
         mail.setUpdateTime(now)
                 .setFlowKey(FlowNodeEnum.SECOND_APPROVAL.getKey())
+                .setCurrentOperator(String.format("%s专班", mail.getSecondDeptName()))
                 .setReturnOperate(returnOperate);
         mailService.updateById(mail);
         return null;

mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java

@@ -280,9 +280,9 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
         model.setDeptIds(createValidate.getDeptIds().toString());
         model.setDeptName(deptVo.getName());
 
-        this.batchSaveDepartByEmpNo(createValidate.getEmpNo(), Arrays.asList(createValidate.getDeptIds()));
+        this.batchSaveDepartByEmpNo(createValidate.getEmpNo(), Collections.singletonList(createValidate.getDeptIds()));
         model.setPostIds(createValidate.getPostIds().toString());
-        this.batchSavePositionByEmpNo(createValidate.getEmpNo(), Arrays.asList(createValidate.getPostIds()));
+        this.batchSavePositionByEmpNo(createValidate.getEmpNo(), Collections.singletonList(createValidate.getPostIds()));
         model.setEmpNo(createValidate.getEmpNo());
         model.setName(createValidate.getName());
         model.setAvatar(avatar);
@@ -343,6 +343,7 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
         model.setDeptName(deptVo.getName());
 
         if(StringUtils.isNotNull(updateValidate.getPostIds())) {
+            model.setPostIds(updateValidate.getPostIds().toString());
             if(!policeUser.getPostIds().equals(model.getPostIds())){
                 this.batchSavePositionByEmpNo(updateValidate.getEmpNo(), Collections.singletonList(updateValidate.getPostIds()));
             }

mailbox-lan/src/main/resources/mapper/PoliceUserMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.biutag.lan.mapper.PoliceUserMapper">
 
     <select id="selectPage" resultType="com.biutag.lan.vo.system.PoliceUserListedVo">
-        select u.id, u.emp_no, u.name, u.id_code, u.phone, r.name role, d.full_name dept, p.name post, u.last_login_time, u.last_login_ip, u.is_disable
+        select u.id, u.emp_no, u.name, u.id_code, u.phone mobile, r.name role, d.full_name dept, p.name post, u.last_login_time, u.last_login_ip, u.is_disable
         from police_user u
             left join dept d on u.dept_ids = d.id
             left join post p on u.post_ids = p.id