用户模块删除部门的定义和关联

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserInfo.java

@@ -46,9 +46,6 @@ public class UserInfo {
     @ApiModelProperty(value = "是否ABI")
     private Integer isAbi;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
     @ApiModelProperty(value = "供应商id")
     private Long factoryId;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/CreateUserReq.java

@@ -33,9 +33,6 @@ public class CreateUserReq implements Serializable {
   @ApiModelProperty(value = "是否ABI")
   private Integer isAbi;
 
-  @ApiModelProperty(value = "部门id")
-  private Long deptId;
-
   @ApiModelProperty(value = "供应商id")
   private Long factoryId;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateUserReq.java

@@ -23,9 +23,6 @@ public class UpdateUserReq implements Serializable {
   @ApiModelProperty(value = "邮箱")
   private String email;
 
-  @ApiModelProperty(value = "部门id")
-  private Long deptId;
-
   @ApiModelProperty(value = "供应商id")
   private Long factoryId;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetUserInfoRes.java

@@ -41,9 +41,6 @@ public class GetUserInfoRes implements Serializable {
   @ApiModelProperty(value = "是否ABI")
   private Integer isAbi;
 
-  @ApiModelProperty(value = "部门id")
-  private Long deptId;
-
   @ApiModelProperty(value = "供应商id")
   private Long factoryId;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListUserRes.java

@@ -48,9 +48,6 @@ public class ListUserRes extends PageResp implements Serializable {
     @ApiModelProperty(value = "邮箱")
     private String email;
 
-    @ApiModelProperty(value = "部门")
-    private String deptName;
-
     @ApiModelProperty(value = "供应商")
     private String factoryName;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/entity/UserInfoResp.java

@@ -29,9 +29,6 @@ public class UserInfoResp implements Serializable {
     @ApiModelProperty(value = "邮箱")
     private String email;
 
-    @ApiModelProperty(value = "部门")
-    private String deptName;
-
     @ApiModelProperty(value = "供应商")
     private String factoryName;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/UserManagerServiceImpl.java

@@ -80,7 +80,6 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
         userInfo.setEmail(createUserReq.getEmail());
         userInfo.setPassword(createUserReq.getPassword());
         userInfo.setIsAbi(createUserReq.getIsAbi());
-        userInfo.setDeptId(createUserReq.getDeptId());
         userInfo.setFactoryId(createUserReq.getFactoryId());
         userInfo.setRoleCode(createUserReq.getRoleCode());
 
@@ -116,8 +115,6 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
             throw new BusinessException("该用户不存在。");
         }
         userInfo.setEmail(updateUserReq.getEmail());
-        userInfo.setDeptId(updateUserReq.getDeptId());
-        userInfo.setDeptId(updateUserReq.getDeptId());
         userInfo.setFactoryId(updateUserReq.getFactoryId());
         userInfo.setRoleCode(updateUserReq.getRoleCode());
         userInfoMapper.updateById(userInfo);

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserInfoMapper.xml

@@ -12,7 +12,6 @@
         <result column="LOGIN_NAME" property="loginName"/>
         <result column="PASSWORD" property="password"/>
         <result column="is_abi" property="isAbi"/>
-        <result column="dept_id" property="deptId"/>
         <result column="factory_id" property="factoryId"/>
         <result column="is_enable" property="isEnable"/>
         <result column="role_code" property="roleCode"/>
@@ -25,19 +24,18 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, USER_NAME, EMPLOYEE_NO, PHONE, EMAIL, LOGIN_NAME, PASSWORD, is_abi, dept_id, factory_id, role_code, is_enable, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
+        ID, USER_NAME, EMPLOYEE_NO, PHONE, EMAIL, LOGIN_NAME, PASSWORD, is_abi, factory_id, role_code, is_enable, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
     </sql>
 
     <!--列表查询列-->
     <sql id="Base_Column_List_Page">
-        u.ID, u.USER_NAME, u.EMPLOYEE_NO, u.PHONE, u.EMAIL, d.dept_name, f.factory_name, r.role_name, u.is_enable, u.update_time
+        u.ID, u.USER_NAME, u.EMPLOYEE_NO, u.PHONE, u.EMAIL, f.factory_name, r.role_name, u.is_enable, u.update_time
     </sql>
 
     <select id="selectUserInfoPage" resultType="com.abi.qms.platform.dto.res.entity.UserInfoResp">
         SELECT
         <include refid="Base_Column_List_Page"/>
         from user_info u
-        LEFT JOIN base_department d ON u.dept_id = d.id
         LEFT JOIN base_factory f ON u.factory_id = f.id
         LEFT JOIN user_role r ON u.role_code = r.role_code
         WHERE 1=1