From 0d4b0152d35e1d0768205d122c8dd664f007d5a4 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: Mon, 6 Jan 2025 23:44:40 +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 --- .../mapper/manage/BusExamInfoMapper.xml | 8 +- .../ProProjectInfoSubdeptsServiceImpl.java | 92 ++++++++++--------- .../manage/service/impl/UniServiceImpl.java | 7 +- .../system/controller/SysUserController.java | 33 ++----- .../src/views/manage/busExamInfo/index.vue | 5 +- .../views/manage/busExamQuestion/index.vue | 4 +- .../proProjectInfoSubdeptsGroup/index.vue | 1 + .../src/views/system/dept/index.vue | 4 +- .../src/views/system/user/index.vue | 13 ++- 9 files changed, 81 insertions(+), 86 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusExamInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusExamInfoMapper.xml index 73df197d..05e4457a 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusExamInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusExamInfoMapper.xml @@ -52,10 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bei.is_del != 2 - and bei.com_id = #{comId} - and bei.project_id = #{projectId} - and bei.com_id = #{activeComId} - and bei.project_id = #{activeProjectId} + and (bei.com_id = #{comId} or bei.com_id is null) + and (bei.project_id = #{projectId} or bei.project_id is null) + and (bei.com_id = #{activeComId} or bei.com_id is null) + and (bei.project_id = #{activeProjectId} or bei.project_id is null) and pi.project_name like concat('%', #{projectName}, '%') and bei.exam_title = #{examTitle} and bei.exam_type = #{examType} 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 535c1028..579297fb 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 @@ -152,52 +152,54 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept if(res>0 && (Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(),SubDeptsEnums.LWFB.getCode()))){ // 保存单位人员信息 - ProProjectInfoSubdeptsUsers subdeptsUser = new ProProjectInfoSubdeptsUsers(); - subdeptsUser.setComId(info.getComId()); - subdeptsUser.setProjectId(info.getId()); - subdeptsUser.setSubDeptId(proProjectInfoSubdepts.getId()); - subdeptsUser.setSubDeptName(proProjectInfoSubdepts.getSubDeptName()); - subdeptsUser.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); - subdeptsUser.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); - subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); - subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdepts.getSubDeptLeaderPowerPath()); - subdeptsUser.setUserId(proProjectInfoSubdepts.getSubDeptLeaderId()); - subdeptsUser.setUserPost(UserPostEnums.WTDL.getCode()); - subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); - subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); - subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); - subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); - subdeptsUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); - subdeptsUser.setUserSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); - subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); - subdeptsUser.setUserInfos(proProjectInfoSubdepts.getLeaderUserInfos()); - subdeptsUser.setCraftType(CraftTypeEnums.GLRY.getCode()); - subdeptsUser.setCraftPost(CraftPostEnums.WTDL.getCode()); - subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); - subdeptsUser.setSubStep(2L); - subdeptsUser.setCreateBy(SecurityUtils.getUsername()); - subdeptsUser.setApproveStatus(ApproveStatus.passed.getCode()); - subdeptsUser.setCreateTime(DateUtils.getNowDate()); - int r = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(subdeptsUser); - // 系统添加的人员默认增加入场信息 - uniService.syncUniUser(subdeptsUser); - try { - if(r>0){ - String accessToken = wxMaService.getAccessToken(); - String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; - String savePath = ProfileConfig.profilePath+"/"+filePath; - String profilePath = ProfileConfig.profile+"/"+filePath; - log.info("accessToken...{}",accessToken); - // 生成二维码 - File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(),280); - FileUtil.copyFile(file,new File(savePath)); - subdeptsUser.setQrCode(profilePath); - proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); - proProjectInfoSubdepts.setQrCode(profilePath); - proProjectInfoSubdeptsMapper.updateProProjectInfoSubdepts(proProjectInfoSubdepts); + if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){ + ProProjectInfoSubdeptsUsers subdeptsUser = new ProProjectInfoSubdeptsUsers(); + subdeptsUser.setComId(info.getComId()); + subdeptsUser.setProjectId(info.getId()); + subdeptsUser.setSubDeptId(proProjectInfoSubdepts.getId()); + subdeptsUser.setSubDeptName(proProjectInfoSubdepts.getSubDeptName()); + subdeptsUser.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); + subdeptsUser.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); + subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); + subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdepts.getSubDeptLeaderPowerPath()); + subdeptsUser.setUserId(proProjectInfoSubdepts.getSubDeptLeaderId()); + subdeptsUser.setUserPost(UserPostEnums.WTDL.getCode()); + subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderName()); + subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); + subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); + subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); + subdeptsUser.setUserSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); + subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); + subdeptsUser.setUserInfos(proProjectInfoSubdepts.getLeaderUserInfos()); + subdeptsUser.setCraftType(CraftTypeEnums.GLRY.getCode()); + subdeptsUser.setCraftPost(CraftPostEnums.WTDL.getCode()); + subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); + subdeptsUser.setSubStep(2L); + subdeptsUser.setCreateBy(SecurityUtils.getUsername()); + subdeptsUser.setApproveStatus(ApproveStatus.passed.getCode()); + subdeptsUser.setCreateTime(DateUtils.getNowDate()); + int r = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(subdeptsUser); + // 系统添加的人员默认增加入场信息 + uniService.syncUniUser(subdeptsUser); + try { + if(r>0){ + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + // 生成二维码 + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(),280); + FileUtil.copyFile(file,new File(savePath)); + subdeptsUser.setQrCode(profilePath); + proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); + proProjectInfoSubdepts.setQrCode(profilePath); + proProjectInfoSubdeptsMapper.updateProProjectInfoSubdepts(proProjectInfoSubdepts); + } + }catch (Exception e){ + log.error(e.getMessage()); } - }catch (Exception e){ - log.error(e.getMessage()); } } return res; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java index 3c14dabb..621c1e35 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java @@ -473,7 +473,12 @@ public class UniServiceImpl implements IUniService{ //public Long syncUniUser(Long userId, Long projectId) { public Long syncUniUser(ProProjectInfoSubdeptsUsers puser) { //SysUser user=remoteUserService.getSysUserInfo(userId, SecurityConstants.INNER).getData(); - JSONObject jo=JSON.parseObject(puser.getUserInfos()); + JSONObject jo; + if(StringUtils.isNotEmpty(puser.getUserInfos())){ + jo = JSON.parseObject(puser.getUserInfos()); + }else{ + jo = new JSONObject(); + } Long projectId=puser.getProjectId(); String admitGuid=puser.getAdmitGuid(); //jo.getString("admitGuid"); String faceGuid=puser.getFaceGuid(); //jo.getString("faceGuid"); diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index 257b65e8..749df380 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -144,16 +144,11 @@ public class SysUserController extends BaseController { if(Objects.nonNull(sysUser.getRoles()) && sysUser.getRoles().size()>0){ // 权限集合 if(StringUtils.isNotEmpty(sysUser.getUserType())){ - if(Objects.equals(UserTypeEnums.ZSRY.getCode(),sysUser.getUserType()) || Objects.equals(UserTypeEnums.LSRY.getCode(),sysUser.getUserType())){ - // 角色集合 - Set roles = permissionService.getRolePermission(sysUser); - sysUserVo.setRoles(roles); - Set permissions = permissionService.getMenuPermission(sysUser); - sysUserVo.setPermissions(permissions); - }else{ - Set roles = sysUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toSet()); - sysUserVo.setRoles(roles); - } + // 角色集合 + Set roles = permissionService.getRolePermission(sysUser); + sysUserVo.setRoles(roles); + Set permissions = permissionService.getMenuPermission(sysUser); + sysUserVo.setPermissions(permissions); } }else{ Set roles = new HashSet(); @@ -238,20 +233,12 @@ public class SysUserController extends BaseController { AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); if(Objects.nonNull(user.getRoles()) && user.getRoles().size()>0){ + // 角色集合 + Set roles = permissionService.getRolePermission(user); + ajax.put("roles", roles); // 权限集合 - if(StringUtils.isNotEmpty(user.getUserType())){ - if(Objects.equals(UserTypeEnums.ZSRY.getCode(),user.getUserType()) || Objects.equals(UserTypeEnums.LSRY.getCode(),user.getUserType())){ - // 角色集合 - Set roles = permissionService.getRolePermission(user); - ajax.put("roles", roles); - // 权限集合 - Set permissions = permissionService.getMenuPermission(user); - ajax.put("permissions", permissions); - }else{ - Set roles = user.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toSet()); - ajax.put("roles", roles); - } - } + Set permissions = permissionService.getMenuPermission(user); + ajax.put("permissions", permissions); }else{ Set roles = new HashSet(); roles.add("visitors"); diff --git a/yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue index f13880e1..5106a9b3 100644 --- a/yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue @@ -363,8 +363,9 @@ function handleAdd() { return false; } reset(); - form.value.projectId = userStore.currentPrjId; - form.value.projectName = userStore.currentProName; + form.value.comId = userStore.currentComId; + // form.value.projectId = userStore.currentPrjId; + // form.value.projectName = userStore.currentProName; open.value = true; title.value = "添加基础试卷"; } diff --git a/yanzhu-ui-vue3/src/views/manage/busExamQuestion/index.vue b/yanzhu-ui-vue3/src/views/manage/busExamQuestion/index.vue index d0c8b2e2..7de25f0b 100644 --- a/yanzhu-ui-vue3/src/views/manage/busExamQuestion/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/busExamQuestion/index.vue @@ -79,14 +79,14 @@ 新增公司试题 - + {{leaderForm.groupName}} + - + @@ -187,7 +187,7 @@ - + @@ -301,12 +301,13 @@ const data = reactive({ rules: { deptId: [{ required: true, message: "所属单位不能为空", trigger: "change" }], userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }], - nickName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }], + nickName: [{ required: true, message: "用户姓名不能为空", trigger: "blur" }], userType: [{ required: true, message: "用户类型不能为空", trigger: "change" }], + cardCode: [{ required: true, message: "证件号码不能为空", trigger: "blur" }], + avatar: [{ required: true, message: "入场近照不能为空", trigger: "change" }], + roleIds: [{ required: true, message: "用户角色不能为空", trigger: "change" }], password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }], phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }] - cardCode: [{ required: true, message: "用户名称不能为空", trigger: "blur" }], - avatar: [{ required: true, message: "入场近照不能为空", trigger: "change" }], } }); @@ -539,8 +540,6 @@ const getCompId=()=>{ /** 提交按钮 */ function submitForm() { proxy.$refs["userRef"].validate(valid => { - - form.comId=getCompId(); if (valid) { form.value.userName = form.value.nickName; if (form.value.userId != undefined) {