jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-02-19 22:47:24 +08:00
parent 94a0c70313
commit b835425aed
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
View File

@ -15,7 +15,6 @@ import com.yanzhu.manage.enums.*;
import com.yanzhu.manage.mapper.*; import com.yanzhu.manage.mapper.*;
import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService;
import com.yanzhu.manage.service.IUniService; 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.FileUtil;
import com.yanzhu.manage.utils.pdf.PdfImageSignetUtil; import com.yanzhu.manage.utils.pdf.PdfImageSignetUtil;
import com.yanzhu.manage.utils.pdf.PoiUtil; import com.yanzhu.manage.utils.pdf.PoiUtil;
@ -76,6 +75,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
@Autowired @Autowired
private SysUserExtMapper sysUserExtMapper; private SysUserExtMapper sysUserExtMapper;
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@ -238,6 +238,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
userQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId()); userQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId());
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
if(StringUtils.isEmpty(users)){ if(StringUtils.isEmpty(users)){
proProjectInfoSubdeptsUsers.setWorkType(proProjectInfoSubdeptsUsers.getWorkType());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.JSDWGL.getCode()); proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.JSDWGL.getCode());
proProjectInfoSubdeptsUsers.setUseStatus(UseStateEnums.IN.getCode()); proProjectInfoSubdeptsUsers.setUseStatus(UseStateEnums.IN.getCode());
proProjectInfoSubdeptsUsers.setCreateBy(SecurityUtils.getUsername()); proProjectInfoSubdeptsUsers.setCreateBy(SecurityUtils.getUsername());
@ -278,6 +279,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
}else { }else {
ProProjectInfoSubdeptsUsers deptUser = users.get(0); ProProjectInfoSubdeptsUsers deptUser = users.get(0);
deptUser.setUserName(proProjectInfoSubdeptsUsers.getUserName()); deptUser.setUserName(proProjectInfoSubdeptsUsers.getUserName());
deptUser.setWorkType(proProjectInfoSubdeptsUsers.getWorkType());
deptUser.setUserPhone(proProjectInfoSubdeptsUsers.getUserPhone()); deptUser.setUserPhone(proProjectInfoSubdeptsUsers.getUserPhone());
deptUser.setCardCode(proProjectInfoSubdeptsUsers.getCardCode()); deptUser.setCardCode(proProjectInfoSubdeptsUsers.getCardCode());
deptUser.setUserPicture(proProjectInfoSubdeptsUsers.getUserPicture()); deptUser.setUserPicture(proProjectInfoSubdeptsUsers.getUserPicture());

7
yanzhu-ui-vue3/src/components/CurrentProject/index.vue
View File

@ -164,11 +164,8 @@ function showProList() {
/** 初始化页面 */ /** 初始化页面 */
function initPage() { function initPage() {
let roles = userStore.roles; let roles = userStore.roles;
if(roles.includes("admin") || roles.includes("gsAdmin")){ let _isAdmin = roles.some(item => item.includes("admin") || item.includes("gsAdmin"));
isAdmin.value = true; isAdmin.value = _isAdmin;
}else{
isAdmin.value = false;
}
} }
initPage(); initPage();

3
yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue
View File

@ -524,7 +524,8 @@ function initPost() {
function initTrainLevel() { function initTrainLevel() {
let datas=edu_train_level._object.edu_train_level; let datas=edu_train_level._object.edu_train_level;
let roles = userStore.roles; 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; data.eduTrainLevelList = datas;
}else{ }else{

7
yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
View File

@ -767,11 +767,8 @@ function getMapInfo() {
/** 初始化页面 */ /** 初始化页面 */
function initPage() { function initPage() {
let roles = userStore.roles; let roles = userStore.roles;
if (roles.includes("admin") || roles.includes("gsAdmin")) { let _isAdmin = roles.some(item => item.includes("admin") || item.includes("gsAdmin"));
isAdmin.value = true; isAdmin.value = _isAdmin;
} else {
isAdmin.value = false;
}
} }
initPage(); initPage();