花名册调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterBase.java

@@ -82,6 +82,7 @@ public class RosterBase extends BaseEntity {
     /**
      * 手机号码
      */
+    @Query(type = QueryType.LIKE, tableColumn = "rb.mobile")
     private String mobile;
 
     /**
@@ -228,6 +229,7 @@ public class RosterBase extends BaseEntity {
     /**
      * 人员类型  1员工  2游客
      */
+    @Query(type = QueryType.EQ, tableColumn = "rb.person_type")
     private String personType;
 
     /**

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

@@ -231,21 +231,6 @@ public class UserController {
         if ( isCheckLoginName ( userDTO.getOldLoginName ( ),userDTO.getId(), userDTO.getLoginName ( ) ) ) {
             return ResponseEntity.badRequest ( ).body ( "保存用户'" + userDTO.getLoginName ( ) + "'失败，登录名已存在!" );
         }
-        //对管理部门做查询操作，根据名称查询部门id信息
-        if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
-            List<String> officeIdList = Lists.newLinkedList();
-            //获取当前人管理的部门名称
-            List<String> manageOfficeNameList=Arrays.asList(userDTO.getManageOfficeIds().split(","));
-            if(manageOfficeNameList.size()>0){
-                //查询这些部门信息
-                officeIdList = officeService.getOfficeIdByNames(manageOfficeNameList);
-                if(officeIdList.size()>0){
-                    String officeIds = String.join(",", officeIdList);
-                    userDTO.setManageOfficeIds(officeIds);
-                }
-            }
-            userService.updateUserManageOffice(officeIdList,userDTO);
-        }
         // 保存用户信息
         userService.saveOrUpdate ( userDTO );
         return ResponseEntity.ok ( "保存用户'" + userDTO.getLoginName ( ) + "'成功!" );

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

@@ -273,8 +273,17 @@ public class UserService  extends ServiceImpl<UserMapper, User> {
 				baseMapper.insertUserPost ( userDTO.getId (), postDTO.getId () );
 			} );
 		}
+		// 更新用户的管理部门
+		List<String> officeIdList = new ArrayList<>();
+		if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
+			List<String> officeIds = Arrays.asList(userDTO.getManageOfficeIds().split(","));
+			officeIdList.addAll(officeIds);
+		}
+		this.updateUserManageOffice(officeIdList, userDTO);
+
 		// 新增/修改关联花名册数据
 		this.saveOrUpdateRoster(user);
+
 		UserUtils.deleteCache ( userDTO );
 	}