From 45af87f1f6f593497987cbd2292f69cffd84840f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Wed, 15 Jan 2025 23:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanzhu/auth/service/SysLoginService.java | 28 ++++----- .../ProProjectInfoSubdeptsServiceImpl.java | 1 - ...roProjectInfoSubdeptsUsersServiceImpl.java | 1 - .../service/impl/SysUserServiceImpl.java | 62 ++++++++++++------- .../miniprogram/project.private.config.json | 2 +- .../proProjectInfoSubdeptsUsers/index.vue | 29 ++++++--- 6 files changed, 72 insertions(+), 51 deletions(-) diff --git a/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java b/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java index d7d38faf..d93e9474 100644 --- a/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java +++ b/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java @@ -202,31 +202,25 @@ public class SysLoginService { LoginUser userInfo; // 查询小程序授权情况 - R uniResult = remoteUserService.findByMaOpenId(loginBody.getOpenId(),SecurityConstants.INNER); - if(Objects.isNull(uniResult) || Objects.isNull(uniResult.getData())){ - Map phoneResult = remoteUserService.getMaPhoneNumber(loginBody,SecurityConstants.INNER).getData(); - if(Objects.nonNull(phoneResult) && Objects.nonNull(phoneResult.get("phoneNumber"))){ - // 查询用户信息 - R userResult = remoteUserService.getUserInfo(Convert.toStr(phoneResult.get("phoneNumber")), SecurityConstants.INNER); - if(Objects.isNull(userResult.getData())){ - throw new ServiceException("登录失败，当前手机号未获取项目授权..."); - } - userInfo = userResult.getData(); + Map phoneResult = remoteUserService.getMaPhoneNumber(loginBody,SecurityConstants.INNER).getData(); + if(Objects.nonNull(phoneResult) && Objects.nonNull(phoneResult.get("phoneNumber"))){ + // 查询用户信息 + R userResult = remoteUserService.getUserInfo(Convert.toStr(phoneResult.get("phoneNumber")), SecurityConstants.INNER); + userInfo = userResult.getData(); + if(Objects.isNull(userResult.getData())){ + throw new ServiceException("登录失败，当前手机号未获取项目授权..."); + } + R uniResult = remoteUserService.findByMaOpenId(loginBody.getOpenId(),SecurityConstants.INNER); + if(Objects.isNull(uniResult) || Objects.isNull(uniResult.getData())){ SysUserUniopen uniopen = new SysUserUniopen(); uniopen.setUserId(userInfo.getUserid()); uniopen.setUserName(userInfo.getUsername()); uniopen.setUserNick(userInfo.getSysUser().getNickName()); uniopen.setMaOpenId(loginBody.getOpenId()); remoteUserService.addSysUserUniopen(uniopen,SecurityConstants.INNER); - }else{ - throw new ServiceException("获取授权手机号失败..."); } }else{ - R userResult = remoteUserService.getUserInfo(Convert.toStr(uniResult.getData().getUserName()), SecurityConstants.INNER); - if(Objects.isNull(userResult.getData())){ - throw new ServiceException("登录失败，当前手机号未获取项目授权..."); - } - userInfo = userResult.getData(); + throw new ServiceException("获取授权手机号失败..."); } SysUser user = userInfo.getSysUser(); if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java index cb498e12..583edc66 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java @@ -235,7 +235,6 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept sysUser.setUpdateBy(DataSourceEnuns.APP.getInfo()); sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdepts.getSubDeptName()); - sysUser.setActiveProjectId(proProjectInfoSubdepts.getProjectId()); try { R userResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); proProjectInfoSubdepts.setSubDeptLeaderId(userResult.getData()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index 82137ad1..bbada3f8 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -378,7 +378,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu sysUser.setUpdateBy(SecurityUtils.getUsername()); sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName()); - sysUser.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId()); Long userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); proProjectInfoSubdeptsUsers.setUserId(userId); proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); 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 4c2ad470..1172a099 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 @@ -447,6 +447,7 @@ public class SysUserServiceImpl implements ISysUserService public Long registerUser(SysUser user) throws ServiceException { SysUser sysUser = userMapper.selectByPhone(user.getPhonenumber()); + String userPost = user.getUserType(); if(Objects.nonNull(sysUser)){ user.setUserId(sysUser.getUserId()); sysUser.setUserName(user.getUserName()); @@ -490,63 +491,79 @@ public class SysUserServiceImpl implements ISysUserService } } Long userId = user.getUserId(); - if(Objects.nonNull(user.getUserType()) && Objects.nonNull(user.getActiveProjectId())){ + if(Objects.nonNull(userPost) && Objects.nonNull(user.getDeptId())){ // 删除用户与角色关联 List sysUserRoleList = new ArrayList<>(); SysUserRole userRole = new SysUserRole(); userRole.setUserId(userId); - userRole.setDeptId(user.getActiveProjectId()); + userRole.setDeptId(user.getDeptId()); userRoleMapper.deleteUserRoleByUserRole(userRole); - if(Objects.equals(user.getUserType(), UserTypeEnums.FBWTDL.getCode())){ - List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getActiveProjectId()); + System.out.println("user.getUserType()==>"+userPost); + if(Objects.equals(userPost, UserTypeEnums.FBWTDL.getCode())){ + List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getDeptId()); + System.out.println("FBWTDL==>"+list.size()); if(StringUtils.isEmpty(list)){ //新增单位角色... - Long roleId = insertDeptSysRole(UserTypeEnums.FBWTDL.getInfo(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getActiveProjectId(),user.getActiveProjectId()); + Long roleId = insertDeptSysRole(UserTypeEnums.FBWTDL.getInfo(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getDeptId(),user.getDeptId()); userRole.setRoleId(roleId); }else{ userRole.setRoleId(list.get(0).getRoleId()); } sysUserRoleList.add(userRole); userRoleMapper.batchUserRole(sysUserRoleList); - }else if(Objects.equals(user.getUserType(), UserTypeEnums.FBXMJL.getCode())){ - List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getActiveProjectId()); + }else if(Objects.equals(userPost, UserTypeEnums.FBXMJL.getCode())){ + List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getDeptId()); + System.out.println("FBXMJL==>"+list.size()); if(StringUtils.isEmpty(list)){ //新增单位角色... - Long roleId = insertDeptSysRole(UserTypeEnums.FBXMJL.getInfo(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getActiveProjectId(),user.getActiveProjectId()); + Long roleId = insertDeptSysRole(UserTypeEnums.FBXMJL.getInfo(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getDeptId(),user.getDeptId()); userRole.setRoleId(roleId); }else{ userRole.setRoleId(list.get(0).getRoleId()); } sysUserRoleList.add(userRole); userRoleMapper.batchUserRole(sysUserRoleList); - }else if(Objects.equals(user.getUserType(), UserTypeEnums.FBBZZZ.getCode())){ - List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getActiveProjectId()); + }else if(Objects.equals(userPost, UserTypeEnums.FBBZZZ.getCode())){ + List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getDeptId()); + System.out.println("FBBZZZ==>"+list.size()); if(StringUtils.isEmpty(list)){ //新增单位角色... - Long roleId = insertDeptSysRole(UserTypeEnums.FBBZZZ.getInfo(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getActiveProjectId(),user.getActiveProjectId()); + Long roleId = insertDeptSysRole(UserTypeEnums.FBBZZZ.getInfo(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getDeptId(),user.getDeptId()); userRole.setRoleId(roleId); }else{ userRole.setRoleId(list.get(0).getRoleId()); } sysUserRoleList.add(userRole); userRoleMapper.batchUserRole(sysUserRoleList); - }else if(Objects.equals(user.getUserType(), UserTypeEnums.JSDWRY.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.FBLWRY.getCode())){ + List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBLWRY.getKeys()+"_"+user.getDeptId()); + System.out.println("FBLWRY==>"+list.size()); + if(StringUtils.isEmpty(list)){ + //新增单位角色... + Long roleId = insertDeptSysRole(UserTypeEnums.FBLWRY.getInfo(),UserTypeEnums.FBLWRY.getKeys()+"_"+user.getDeptId(),user.getDeptId()); + userRole.setRoleId(roleId); + }else{ + userRole.setRoleId(list.get(0).getRoleId()); + } + sysUserRoleList.add(userRole); + userRoleMapper.batchUserRole(sysUserRoleList); + }else if(Objects.equals(userPost, UserTypeEnums.JSDWRY.getCode())){ - }else if(Objects.equals(user.getUserType(), UserTypeEnums.JLDWRY.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.JLDWRY.getCode())){ - }else if(Objects.equals(user.getUserType(), UserTypeEnums.SGDWRY.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.SGDWRY.getCode())){ - }else if(Objects.equals(user.getUserType(), UserTypeEnums.CLFBRY.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.CLFBRY.getCode())){ - }else if(Objects.equals(user.getUserType(), UserTypeEnums.HQFBRY.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.HQFBRY.getCode())){ - }else if(Objects.equals(user.getUserType(), UserTypeEnums.TSSBRY.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.TSSBRY.getCode())){ - }else if(Objects.equals(user.getUserType(), UserTypeEnums.KTDWRY.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.KTDWRY.getCode())){ - }else if(Objects.equals(user.getUserType(), UserTypeEnums.SJDWRY.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.SJDWRY.getCode())){ - }else if(Objects.equals(user.getUserType(), UserTypeEnums.OTHERS.getCode())){ + }else if(Objects.equals(userPost, UserTypeEnums.OTHERS.getCode())){ } } @@ -563,7 +580,7 @@ public class SysUserServiceImpl implements ISysUserService SysUser info = userMapper.checkUserNameUnique(user.getUserName()); SysUserRole userRole = new SysUserRole(); userRole.setUserId(info.getUserId()); - userRole.setDeptId(user.getActiveProjectId()); + userRole.setDeptId(user.getDeptId()); userRoleMapper.deleteUserRoleByUserRole(userRole); return info.getUserId(); } @@ -583,7 +600,8 @@ public class SysUserServiceImpl implements ISysUserService sysRole.setStatus(ShiFouEnums.FOU.getCodeStr()); sysRole.setCreateBy("SYSTEM"); sysRole.setCreateTime(DateUtils.getNowDate()); - roleMapper.insertRole(sysRole); + int r1 = roleMapper.insertRole(sysRole); + System.out.println("insertDeptSysRole.insertRole==>"+r1); List sysRoleDeptList = new ArrayList<>(); SysRoleDept sysRoleDept = new SysRoleDept(); sysRoleDept.setRoleId(sysRole.getRoleId()); diff --git a/yanzhu-ui-app/miniprogram/project.private.config.json b/yanzhu-ui-app/miniprogram/project.private.config.json index cdd6323e..cef99850 100644 --- a/yanzhu-ui-app/miniprogram/project.private.config.json +++ b/yanzhu-ui-app/miniprogram/project.private.config.json @@ -11,7 +11,7 @@ { "name": "pages/project_qr/index", "pathName": "pages/project_qr/index", - "query": "QRPID=116&SIGID=1", + "query": "QRPID=132&SIGID=1", "launchMode": "default", "scene": null }, diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue index 6d1381b2..28fb472f 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue @@ -3,14 +3,12 @@ - + - + @@ -21,12 +19,12 @@ - + - + @@ -95,15 +93,23 @@ - + + + - - +