diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserCom.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserCom.java new file mode 100644 index 00000000..f62cab58 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserCom.java @@ -0,0 +1,71 @@ +package com.yanzhu.system.domain; + +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 系统用户扩展对象 sys_user_ext + * + * @author yanzhu + * @date 2025-01-09 + */ +public class SysUserCom extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + private Long userId; + + /** 项目ID */ + private Long comId; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + private Long isActive; + + private String comName; + + public String getComName() { + return comName; + } + + public void setComName(String comName) { + this.comName = comName; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getComId() { + return comId; + } + + public void setComId(Long comId) { + this.comId = comId; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getIsActive() { + return isActive; + } + + public void setIsActive(Long isActive) { + this.isActive = isActive; + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserExt.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserExt.java index 62a9a1b2..23078f9f 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserExt.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserExt.java @@ -1,9 +1,9 @@ package com.yanzhu.system.domain; +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import Excel; -import BaseEntity; /** * 系统用户扩展对象 sys_user_ext diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserComMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserComMapper.java new file mode 100644 index 00000000..85b82894 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserComMapper.java @@ -0,0 +1,38 @@ +package com.yanzhu.system.mapper; + +import com.yanzhu.system.domain.SysUserCom; +import com.yanzhu.system.domain.SysUserExt; + +import java.util.List; + +/** + * 系统用户扩展Mapper接口 + * + * @author yanzhu + * @date 2025-01-09 + */ +public interface SysUserComMapper +{ + /** + * 查询用户的租户 + * @param sysUserCom + * @return + */ + public List selectUserComs(SysUserCom sysUserCom); + + /** + * 激活租户 + * @param sysUserCom + * @return + */ + public int updateActive (SysUserCom sysUserCom); + + /** + * 更新状态 + * @param sysUserCom + * @return + */ + public int updateStatus (SysUserCom sysUserCom); + + public int updateActiveTo0(SysUserCom sysUserCom); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserExtMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserExtMapper.java index f0111c35..6ab602f1 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserExtMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserExtMapper.java @@ -17,7 +17,7 @@ public interface SysUserExtMapper * @param userId 系统用户扩展主键 * @return 系统用户扩展 */ - public SysUserExt selectSysUserExtByUserId(Long userId); + public SysUserExt selectSysUserExtById(SysUserExt userExt); /** * 查询系统用户扩展列表 @@ -45,17 +45,8 @@ public interface SysUserExtMapper /** * 删除系统用户扩展 - * - * @param userId 系统用户扩展主键 - * @return 结果 */ - public int deleteSysUserExtByUserId(Long userId); + public int deleteSysUserExtById(SysUserExt sysUserExt); + - /** - * 批量删除系统用户扩展 - * - * @param userIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSysUserExtByUserIds(Long[] userIds); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java index d8fefab5..be58b0df 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.system.mapper; import java.util.List; + +import com.yanzhu.system.api.domain.SysUser; import com.yanzhu.system.domain.SysUserPost; /** @@ -41,4 +43,6 @@ public interface SysUserPostMapper * @return 结果 */ public int batchUserPost(List userPostList); + + void deleteUserPostByUser(SysUserPost user); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserComMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserComMapper.xml new file mode 100644 index 00000000..95c910a0 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserComMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + update sys_user_com set is_active=0 where user_id=#{userId} + + + update sys_user_com set is_active=#{isActive} where user_id=#{userId} and com_id=#{comId} + + + update sys_user_com set status=#{status} where user_id=#{userId} and com_id=#{comId} + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml index 508eb3c1..695f5ba2 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml @@ -23,9 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where user_id = #{userId} + where user_id = #{userId} and project_id=#{projectId} @@ -54,14 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - - delete from sys_user_ext where user_id = #{userId} - - - - delete from sys_user_ext where user_id in - - #{userId} - + + delete from sys_user_ext where user_id = #{userId} and project_id=#{projectId} \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserPostMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserPostMapper.xml index e8ca65bb..337759ba 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -23,11 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{userId} + + + delete from sys_user_post where user_id=#{userId} and project_id=#{projectId} + - insert into sys_user_post(user_id, post_id) values + insert into sys_user_post(user_id, post_id,project_id) values - (#{item.userId},#{item.postId}) + (#{item.userId},#{item.postId},#{item.projectId}) diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysProfileController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysProfileController.java index 437ba9c8..846b5aca 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysProfileController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysProfileController.java @@ -1,14 +1,10 @@ package com.yanzhu.system.controller; import java.util.Arrays; + +import com.yanzhu.system.domain.SysUserCom; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import com.yanzhu.common.core.domain.R; import com.yanzhu.common.core.utils.StringUtils; @@ -155,4 +151,17 @@ public class SysProfileController extends BaseController } return error("上传图片异常，请联系管理员"); } + + @GetMapping("/getUserComps/{userId}") + public AjaxResult getUserComs(@PathVariable Long userId){ + if(userId==null||userId.longValue()==0){ + userId=SecurityUtils.getLoginUser().getUserid(); + } + return AjaxResult.success(userService.getUserComs(userId)); + } + + @PostMapping("/activeUserCom") + public AjaxResult activeUserCom(@RequestBody SysUserCom userCom){ + return AjaxResult.success(userService.activeUserCom(userCom)); + } } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserExtService.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserExtService.java index 584f84df..70ece4f7 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserExtService.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserExtService.java @@ -1,6 +1,8 @@ package com.yanzhu.system.service; import java.util.List; + +import com.yanzhu.system.api.domain.SysUser; import com.yanzhu.system.domain.SysUserExt; /** @@ -13,11 +15,8 @@ public interface ISysUserExtService { /** * 查询系统用户扩展 - * - * @param userId 系统用户扩展主键 - * @return 系统用户扩展 */ - public SysUserExt selectSysUserExtByUserId(Long userId); + public SysUserExt selectSysUserExtById(SysUserExt sysUserExt); /** * 查询系统用户扩展列表 @@ -43,19 +42,11 @@ public interface ISysUserExtService */ public int updateSysUserExt(SysUserExt sysUserExt); - /** - * 批量删除系统用户扩展 - * - * @param userIds 需要删除的系统用户扩展主键集合 - * @return 结果 - */ - public int deleteSysUserExtByUserIds(Long[] userIds); /** * 删除系统用户扩展信息 - * - * @param userId 系统用户扩展主键 - * @return 结果 */ - public int deleteSysUserExtByUserId(Long userId); + public int deleteSysUserExtById(SysUserExt sysUserExt); + + public void updateBySysUser(SysUser sysUser); } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java index 7bc4d311..6250fed0 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java @@ -1,6 +1,7 @@ package com.yanzhu.system.service; import com.yanzhu.system.api.domain.SysUser; +import com.yanzhu.system.domain.SysUserCom; import com.yanzhu.system.vo.AlertUserPassVo; import java.util.List; @@ -260,4 +261,8 @@ public interface ISysUserService * @return */ public int updataUserPassWord(AlertUserPassVo alertUserPassVo); + + public List getUserComs(Long userId); + + public int activeUserCom(SysUserCom userCom); } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserExtServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserExtServiceImpl.java index 7b1cd3e5..b7e61556 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserExtServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserExtServiceImpl.java @@ -1,6 +1,9 @@ package com.yanzhu.system.service.impl; import java.util.List; +import java.util.Objects; + +import com.yanzhu.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.system.mapper.SysUserExtMapper; @@ -21,14 +24,11 @@ public class SysUserExtServiceImpl implements ISysUserExtService /** * 查询系统用户扩展 - * - * @param userId 系统用户扩展主键 - * @return 系统用户扩展 */ @Override - public SysUserExt selectSysUserExtByUserId(Long userId) + public SysUserExt selectSysUserExtById(SysUserExt userExt) { - return sysUserExtMapper.selectSysUserExtByUserId(userId); + return sysUserExtMapper.selectSysUserExtById(userExt ); } /** @@ -67,27 +67,30 @@ public class SysUserExtServiceImpl implements ISysUserExtService return sysUserExtMapper.updateSysUserExt(sysUserExt); } - /** - * 批量删除系统用户扩展 - * - * @param userIds 需要删除的系统用户扩展主键 - * @return 结果 - */ - @Override - public int deleteSysUserExtByUserIds(Long[] userIds) - { - return sysUserExtMapper.deleteSysUserExtByUserIds(userIds); - } /** * 删除系统用户扩展信息 - * - * @param userId 系统用户扩展主键 - * @return 结果 */ @Override - public int deleteSysUserExtByUserId(Long userId) + public int deleteSysUserExtById(SysUserExt sysUserExt) { - return sysUserExtMapper.deleteSysUserExtByUserId(userId); + return sysUserExtMapper.deleteSysUserExtById(sysUserExt); + } + + @Override + public void updateBySysUser(SysUser sysUser) { + SysUserExt where=new SysUserExt(); + where.setUserId(sysUser.getUserId()); + where.setProjectId(sysUser.getDeptId()); + SysUserExt old=selectSysUserExtById(where); + if(Objects.nonNull(old)){ + old.setUserType(sysUser.getUserType()); + old.setStatus(sysUser.getStatus()); + updateSysUserExt(old); + }else{ + where.setUserType(sysUser.getUserType()); + where.setStatus(sysUser.getStatus()); + insertSysUserExt(where); + } } } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java index 029a9183..c14a4ef6 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java @@ -14,10 +14,9 @@ import com.yanzhu.system.api.RemoteProService; import com.yanzhu.system.api.RemoteUserService; import com.yanzhu.system.api.domain.SysDept; import com.yanzhu.system.api.domain.SysRoleDept; -import com.yanzhu.system.domain.SysPost; -import com.yanzhu.system.domain.SysUserPost; -import com.yanzhu.system.domain.SysUserRole; +import com.yanzhu.system.domain.*; import com.yanzhu.system.mapper.*; +import com.yanzhu.system.service.ISysUserExtService; import com.yanzhu.system.vo.AlertUserPassVo; import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; @@ -80,6 +79,10 @@ public class SysUserServiceImpl implements ISysUserService @Autowired protected Validator validator; + @Autowired + private ISysUserExtService userExtService; + @Autowired + private SysUserComMapper userComMapper; /** * 根据条件分页查询用户列表 * @@ -343,6 +346,7 @@ public class SysUserServiceImpl implements ISysUserService sysUser.setUpdateTime(user.getUpdateTime()); sysUser.setPassword(user.getPassword()); rows=userMapper.updateUser(sysUser); + userExtService.updateBySysUser(sysUser); }else{//此电话号码未注册 user.setCreateBy(user.getUpdateBy()); user.setCreateTime(user.getUpdateTime()); @@ -350,6 +354,7 @@ public class SysUserServiceImpl implements ISysUserService rows=userMapper.insertUser(user); user.setIsActive(1l); userMapper.insertUserCom(user); + userExtService.updateBySysUser(user); } //int rows = userMapper.insertUser(user); // 新增用户岗位关联 @@ -735,9 +740,13 @@ public class SysUserServiceImpl implements ISysUserService SysUserPost up = new SysUserPost(); up.setUserId(user.getUserId()); up.setPostId(postId); - + up.setProjectId(user.getDeptId()); list.add(up); } + SysUserPost delUp=new SysUserPost(); + delUp.setUserId(user.getUserId()); + delUp.setProjectId(user.getDeptId()); + userPostMapper.deleteUserPostByUser(delUp); userPostMapper.batchUserPost(list); } } @@ -898,4 +907,22 @@ public class SysUserServiceImpl implements ISysUserService return userMapper.updateUser(sysUser); } + @Override + public List getUserComs(Long userId) { + SysUserCom where=new SysUserCom(); + where.setUserId(userId); + return userComMapper.selectUserComs(where); + } + + @Override + public int activeUserCom(SysUserCom userCom) { + userCom.setIsActive(1l); + int cnt= userComMapper.updateActiveTo0(userCom); + cnt+= userComMapper.updateActive(userCom); + SysUser user=selectUserById(userCom.getUserId()); + user.setComId(userCom.getComId()); + cnt+= userMapper.updateUser(user); + return cnt; + } + } diff --git a/yanzhu-ui-vue3/src/api/system/user.js b/yanzhu-ui-vue3/src/api/system/user.js index 43f41bc7..45529c56 100644 --- a/yanzhu-ui-vue3/src/api/system/user.js +++ b/yanzhu-ui-vue3/src/api/system/user.js @@ -161,4 +161,19 @@ export function deptFirTreeSelect() { url: '/system/user/deptTree', method: 'get' }) +} + +export function getUserComs(userId){ + return request({ + url: '/system/user/profile/getUserComps/'+userId, + method: 'get' + }) +} + +export function activeUserCom(userCom){ + return request({ + url:'/system/user/profile/activeUserCom', + method:'post', + data:userCom + }) } \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/layout/components/Navbar.vue b/yanzhu-ui-vue3/src/layout/components/Navbar.vue index 5701c069..e923a25c 100644 --- a/yanzhu-ui-vue3/src/layout/components/Navbar.vue +++ b/yanzhu-ui-vue3/src/layout/components/Navbar.vue @@ -6,6 +6,7 @@