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 149fb7c8..732d841a 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 @@ -15,7 +15,6 @@ import com.yanzhu.manage.enums.*; import com.yanzhu.manage.mapper.*; import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; import com.yanzhu.manage.service.IUniService; -import com.yanzhu.manage.utils.WxQrCodeUtils; import com.yanzhu.manage.utils.pdf.FileUtil; import com.yanzhu.manage.utils.pdf.PdfImageSignetUtil; import com.yanzhu.manage.utils.pdf.PoiUtil; @@ -76,6 +75,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu @Autowired private SysUserExtMapper sysUserExtMapper; + @Autowired private SysUserMapper sysUserMapper; @@ -238,6 +238,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu userQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId()); List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); if(StringUtils.isEmpty(users)){ + proProjectInfoSubdeptsUsers.setWorkType(proProjectInfoSubdeptsUsers.getWorkType()); proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.JSDWGL.getCode()); proProjectInfoSubdeptsUsers.setUseStatus(UseStateEnums.IN.getCode()); proProjectInfoSubdeptsUsers.setCreateBy(SecurityUtils.getUsername()); @@ -278,6 +279,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu }else { ProProjectInfoSubdeptsUsers deptUser = users.get(0); deptUser.setUserName(proProjectInfoSubdeptsUsers.getUserName()); + deptUser.setWorkType(proProjectInfoSubdeptsUsers.getWorkType()); deptUser.setUserPhone(proProjectInfoSubdeptsUsers.getUserPhone()); deptUser.setCardCode(proProjectInfoSubdeptsUsers.getCardCode()); deptUser.setUserPicture(proProjectInfoSubdeptsUsers.getUserPicture()); diff --git a/yanzhu-ui-vue3/src/components/CurrentProject/index.vue b/yanzhu-ui-vue3/src/components/CurrentProject/index.vue index f9311e4c..22e9f0b6 100644 --- a/yanzhu-ui-vue3/src/components/CurrentProject/index.vue +++ b/yanzhu-ui-vue3/src/components/CurrentProject/index.vue @@ -164,11 +164,8 @@ function showProList() { /** 初始化页面 */ function initPage() { let roles = userStore.roles; - if(roles.includes("admin") || roles.includes("gsAdmin")){ - isAdmin.value = true; - }else{ - isAdmin.value = false; - } + let _isAdmin = roles.some(item => item.includes("admin") || item.includes("gsAdmin")); + isAdmin.value = _isAdmin; } initPage(); diff --git a/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue b/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue index 27de0367..dc42958d 100644 --- a/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue @@ -524,7 +524,8 @@ function initPost() { function initTrainLevel() { let datas=edu_train_level._object.edu_train_level; let roles = userStore.roles; - if(roles.includes("admin") || roles.includes("gsAdmin")){ + let _isAdmin = roles.some(item => item.includes("admin") || item.includes("gsAdmin")); + if(_isAdmin){ // 管理员添加所有数据 data.eduTrainLevelList = datas; }else{ diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue index 27ed37ed..f992ae41 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue @@ -767,11 +767,8 @@ function getMapInfo() { /** 初始化页面 */ function initPage() { let roles = userStore.roles; - if (roles.includes("admin") || roles.includes("gsAdmin")) { - isAdmin.value = true; - } else { - isAdmin.value = false; - } + let _isAdmin = roles.some(item => item.includes("admin") || item.includes("gsAdmin")); + isAdmin.value = _isAdmin; } initPage();