用户编辑

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -478,7 +478,6 @@ public class SysUserController extends BaseController
         //用户id
         String userId = CommonUtil.objToString(userInfo.getUserid());
         userService.checkUserAllowed(user);
-        //||use.getPhonenumber().equals(user.getPhonenumber())
         if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
@@ -489,15 +488,9 @@ public class SysUserController extends BaseController
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(SecurityUtils.getUsername());
-        /*同步更新员工管理*/
-        //员工id
-        String ssId = user.getStaffCode();
-        //部门id
-        String deptId = CommonUtil.objToString(user.getDeptId());
-        //手机号
-        String phone = user.getPhonenumber();
-        //邮箱
-        String email = user.getEmail();
+        if(!SysConstant.PLATFORM_NO.equals(use.getCompanyId()) ){
+            user.setCompanyId(use.getCompanyId());
+        }
         return toAjax(userService.updateUser(user));
     }
 

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.tianhu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tianhu.common.core.constant.UserConstants;
 import com.tianhu.common.core.exception.CustomException;
 import com.tianhu.common.core.utils.DateUtils;
@@ -11,10 +12,12 @@ import com.tianhu.system.api.domain.SysRole;
 import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.api.model.LoginUser;
 import com.tianhu.system.domain.OwnSysUser;
+import com.tianhu.system.domain.SysUserCompanyRel;
 import com.tianhu.system.domain.SysUserPost;
 import com.tianhu.system.domain.SysUserRole;
 import com.tianhu.system.mapper.*;
 import com.tianhu.system.service.ISysConfigService;
+import com.tianhu.system.service.ISysUserCompanyRelService;
 import com.tianhu.system.service.ISysUserService;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.slf4j.Logger;
@@ -54,9 +57,6 @@ public class SysUserServiceImpl implements ISysUserService
     private SysUserPostMapper userPostMapper;
 
     @Autowired
-    private ISysConfigService configService;
-
-    @Autowired
     private TokenService tokenService;
 
     @Autowired
@@ -65,6 +65,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Autowired
     private SysRoleMapper sysRoleMapper;
 
+    @Autowired
+    private ISysUserCompanyRelService iSysUserCompanyRelService;
+
     /**
      * 通过用户名查询用户
      *
@@ -204,11 +207,12 @@ public class SysUserServiceImpl implements ISysUserService
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         Map map = new HashMap();
         map.put("email",user.getEmail());
-        map.put("companyId",user.getCompanyId());
-        SysUser info = userMapper.checkEmailUnique(map);
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
+        if (StringUtils.isNotEmpty(user.getEmail())) {
+            SysUser info = userMapper.checkEmailUnique(map);
+            if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+            {
+                return UserConstants.NOT_UNIQUE;
+            }
         }
         return UserConstants.UNIQUE;
     }
@@ -280,10 +284,13 @@ public class SysUserServiceImpl implements ISysUserService
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 新增用户与角色管理
         insertUserRole(user);
-        // 删除用户与岗位关联
-        userPostMapper.deleteUserPostByUserId(userId);
-        // 新增用户与岗位管理
-        insertUserPost(user);
+
+        SysUserCompanyRel userCompanyRel = new SysUserCompanyRel();
+        userCompanyRel.setSucrDeptId(user.getDeptId());
+        LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId, user.getUserId());
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId, user.getCompanyId());
+        iSysUserCompanyRelService.update(userCompanyRel, lambdaQueryWrapper);
         return userMapper.updateUser(user);
     }
 

tianhu-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -104,7 +104,7 @@
 			u.nick_name nickName,
 			u.email email,
 			u.avatar avatar,
-			u.password status,
+			u.password password,
 			u.sex sex,
 			u.status status,
 			u.del_flag delFlag,
@@ -119,8 +119,7 @@
 			d.parent_id parentId,
 			d.dept_name deptName,
 			d.order_num orderNum,
-			d.leader leader,
-			d.status status
+			d.leader leader
 		from sys_user u
 		LEFT JOIN sys_user_company_rel ucr on (ucr.sucr_company_id = #{companyId} and ucr.sucr_user_id = u.user_id)
 		LEFT JOIN sys_dept d on d.dept_id = ucr.sucr_dept_id
@@ -140,7 +139,7 @@
 	</select>
 
 	<select id="checkEmailUnique" parameterType="map" resultMap="SysUserResult">
-		select user_id, email from sys_user where email = #{email} and company_id = #{companyId} and del_flag = '0' limit 1
+		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -192,11 +191,9 @@
 	<update id="updateUser" parameterType="SysUser">
 		update sys_user
 		<set>
-			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
 			<if test="userName != null and userName != ''">user_name = #{userName},</if>
 			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
 			<if test="email != null and email != ''">email = #{email},</if>
-			<if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber},</if>
 			<if test="sex != null and sex != ''">sex = #{sex},</if>
 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
 			<if test="password != null and password != ''">password = #{password},</if>
@@ -205,13 +202,7 @@
 			<if test="loginDate != null">login_date = #{loginDate},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="remark != null">remark = #{remark},</if>
-			<if test="staffCode != null">staff_code = #{staffCode},</if>
-			<if test="birthDate != null">birth_date = #{birthDate},</if>
-			<if test="entryDate != null">entry_date = #{entryDate},</if>
-			<if test="leaveDate != null">leave_date = #{leaveDate},</if>
-			<if test="education != null">education = #{education},</if>
 			<if test="delFlag != null">del_flag = #{delFlag},</if>
-			<if test="position != null">position = #{position},</if>
 			update_time = sysdate()
 		</set>
 		where user_id = #{userId}