Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-common/src/main/java/cn.com.ty.lift.common/constants/ApiConstants.java

@@ -139,6 +139,16 @@ public class ApiConstants {
          */
         int MAINTENANCE_FAIL = 3;
 
+        /**
+         * 急修工-是
+         */
+        int REPAIR_YES = 1;
+
+        /**
+         * 急修工-否
+         */
+        int REPAIR_NO = 0;
+
     }
 
     /**

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/MtCompanyUser.java

@@ -53,6 +53,8 @@ public class MtCompanyUser {
 
 	private Long updateUserId;
 
+	private Integer repairFlag;
+
 	public MtCompanyUser(){}
 
 	public MtCompanyUser(MtCompanyUserRequest mtCompanyUserRequest){

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/MtCompanyUserResponse.java

@@ -9,6 +9,7 @@ import lombok.Data;
  */
 @Data
 public class MtCompanyUserResponse {
+    private Long id;//信息id
     private Long companyId;//公司id
     private String companyName;//公司名称
     private String companyAddress;//公司地址
@@ -18,4 +19,5 @@ public class MtCompanyUserResponse {
     private String roleName;//角色名称
     private Integer certificateStatus;//操作证状态
     private String job;//用户职位
+    private Integer repairFlag;//是否急修工
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MtCompanyUserService.java

@@ -53,25 +53,27 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         mtCompanyUser.setJob(mtCompanyUserRequest.getJob());
         this.updateById(mtCompanyUser);
         //保存用户角色关联信息
-        //1.删除原有的关联关系
         Long roleId = mtCompanyUserRequest.getRoleId();
         Long userId = mtCompanyUser.getUserId();
-        UserRole userRole = userRoleService.getOne(new QueryWrapper<UserRole>()
-                .eq("role_id", roleId)
-                .eq("user_id", userId)
-        );
-        if (userRole != null) {
-            boolean deleteUserRoleFlag = userRoleService.removeById(userRole.getId());
-            if (!deleteUserRoleFlag) {
-                return RestResponse.fail(ApiConstants.RESULT_ERROR, "删除原有关联关系失败");
+        if(roleId != null){
+            UserRole userRole = userRoleService.getOne(new QueryWrapper<UserRole>()
+                    .eq("role_id", roleId)
+                    .eq("user_id", userId)
+            );
+            if (userRole != null) {
+                //1.删除原有的关联关系
+                boolean deleteUserRoleFlag = userRoleService.removeById(userRole.getId());
+                if (!deleteUserRoleFlag) {
+                    return RestResponse.fail(ApiConstants.RESULT_ERROR, "删除原有关联关系失败");
+                }
             }
+            //保存新的关联关系
+            userRole = new UserRole();
+            userRole.setCompanyId(mtCompanyUser.getMtCompanyId());
+            userRole.setRoleId(roleId);
+            userRole.setUserId(userId);
+            userRoleService.save(userRole);
         }
-        //2.保存新的关联关系
-        userRole = new UserRole();
-        userRole.setCompanyId(mtCompanyUser.getMtCompanyId());
-        userRole.setRoleId(roleId);
-        userRole.setUserId(userId);
-        userRoleService.save(userRole);
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "分配角色成功");
     }
 
@@ -175,6 +177,9 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
             //组装公司用户信息
             for (MtCompanyUser mtCompanyUser : mtCompanyUserList) {
                 MtCompanyUserResponse mtCompanyUserResponse = new MtCompanyUserResponse();
+                mtCompanyUserResponse.setId(mtCompanyUser.getId());
+                //基础信息
+                mtCompanyUserResponse.setRepairFlag(mtCompanyUser.getRepairFlag());
                 UserResponse userResponse = userIdToUserResponse.get(mtCompanyUser.getUserId());
                 //设置用户角色信息
                 mtCompanyUserResponse.setJob(mtCompanyUser.getJob());

lift-system-service/src/main/resources/mapper/MtCompanyUserMapper.xml

@@ -21,13 +21,14 @@
 		<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
 		<result column="create_user_id" property="createUserId" jdbcType="BIGINT" />
 		<result column="delete_user_id" property="deleteUserId" jdbcType="BIGINT" />
+		<result column="repair_flag" property="repairFlag" jdbcType="INTEGER" />
 	</resultMap>
 
 	<sql id="Base_Column_List" >
 		id, mt_company_id, user_id, user_role, is_current_company, is_hx_registered, status, 
 		service_total, satisfaction_total, service_count, maintenance_total, emergency_total, 
 		lift_total, job, delete_flag, create_time, update_time, create_user_id,
-		update_user_id
+		update_user_id, repair_flag
 	</sql>
 
 	<!-- 获取用户在当前公司所处的项目 -->