代码调整提交

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -233,7 +233,7 @@ public class ProjectListService {
         if (StringUtils.isNotEmpty(programAuditDto.getProcInsId())) {
             FlowNode currentTask = flowTaskService.getCurrentTask(programAuditDto.getProcInsId());
             if(null != currentTask && StringUtils.isNotBlank(currentTask.getName())) {
-                if ("项目三级校审".equals(currentTask.getName())) {
+                if ("三级校审".equals(currentTask.getName())) {
                     if (programAuditDto.getStatus().equals("5")) {
                         if (projectListInfo.getGenerateReportNumber().equals("false")) {
                             if(StringUtils.isNotBlank(projectListInfo.getReportType())){

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -228,16 +228,18 @@ public class UserController {
         }
         //对管理部门做查询操作，根据名称查询部门id信息
         if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
+            List<String> officeIdList = Lists.newLinkedList();
             //获取当前人管理的部门名称
             List<String> manageOfficeNameList=Arrays.asList(userDTO.getManageOfficeIds().split(","));
             if(manageOfficeNameList.size()>0){
                 //查询这些部门信息
-                List<String> officeIdList = officeService.getOfficeIdByNames(manageOfficeNameList);
+                officeIdList = officeService.getOfficeIdByNames(manageOfficeNameList);
                 if(officeIdList.size()>0){
                     String officeIds = String.join(",", officeIdList);
                     userDTO.setManageOfficeIds(officeIds);
                 }
             }
+            userService.updateUserManageOffice(officeIdList,userDTO);
         }
         // 保存用户信息
         userService.saveOrUpdate ( userDTO );

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -177,4 +177,17 @@ public interface UserMapper extends BaseMapper<User> {
      */
     String isUpdatePassword(String userId);
 
+    /**
+     * 删除原有员工管理的部门信息
+     * @param userDTO
+     */
+    void deleteUserManageOffice(UserDTO userDTO);
+
+    /**
+     * 添加员工管理的部门信息
+     * @param officeId
+     * @param userId
+     */
+    void insertUserManageOffice(@Param("officeId") String officeId,@Param("userId") String userId);
+
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -331,4 +331,12 @@
 		where id = #{id}
 	</update>
 
+	<delete id="deleteUserManageOffice">
+		delete from sys_user_manage_office where user_id = #{id}
+	</delete>
+
+	<insert id="insertUserManageOffice">
+		insert sys_user_manage_office(user_id, office_id) VALUES (#{userId}, #{officeId})
+	</insert>
+
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -457,4 +457,15 @@ public class UserService  extends ServiceImpl<UserMapper, User> {
 	public void updateUserUpPassword(UserDTO userDTO) {
 		userMapper.updateUserUpPassword (userDTO);
 	}
+
+	public void updateUserManageOffice(List<String> officeIdList, UserDTO userDTO) {
+		//根据用户id删除原有用户管理的部门信息
+		userMapper.deleteUserManageOffice(userDTO);
+		//遍历将新的用户管理的部门信息信息添加进去
+		if(officeIdList.size()>0){
+			for (String officeId : officeIdList) {
+				userMapper.insertUserManageOffice(officeId,userDTO.getId());
+			}
+		}
+	}
 }