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

提交代码

dev_xd
姜玉琦 2025-06-30 11:55:36 +08:00
parent 57d80dd7cd
commit ffaa5690e3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
View File

@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProProjectInfoSubdeptsUsersVo">
select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, ifNull(pdept.sub_dept_name,'项目单位'), psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group,
select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, ifNull(pdept.sub_dept_name,'项目总包单位') as sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group,
psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, dic1.dict_label as craft_type_name, psu.craft_post, dic2.dict_label as craft_post_name, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status,
psu.use_date, psu.use_status, psu.admit_guid, psu.qr_code, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time,
psu.remark, psu.source, psu.face_guid,sd.dept_name com_name,psu.work_type

8
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java
View File

@ -428,7 +428,7 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
Map<String,Object> userMap = new HashMap<>();
userMap.put("userId",user.getUserId());
userMap.put("userName",user.getUserName());
userMap.put("userPhone",user.getUserPhone());
userMap.put("userPhone",Convert.toStr(user.getUserPhone(),""));
String userPost = "";
if(Objects.equals(user.getSubDeptType(),SubDeptsEnums.JSDW.getCode())){
if(user.getWorkType()!=null){
@ -464,14 +464,14 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
Map<String,Object> userMap = new HashMap<>();
userMap.put("userId",user.getUserId());
userMap.put("userName",user.getUserName());
userMap.put("userPhone",user.getUserPhone());
userMap.put("userPhone",Convert.toStr(user.getUserPhone(),""));
userMap.put("state",false);
userList.add(userMap);
}else{
Map<String,Object> userMap = new HashMap<>();
userMap.put("userId",user.getUserId());
userMap.put("userName",user.getUserName());
userMap.put("userPhone",user.getUserPhone());
userMap.put("userPhone",Convert.toStr(user.getUserPhone(),""));
userMap.put("userPostName",StringUtils.eqObj(user.getUserPost(), UserPostEnums.BZZ.getCode())?user.getCraftPostName()+UserPostEnums.BZZ.getInfo():user.getCraftPostName());
userMap.put("state",false);
userList.add(userMap);
@ -489,7 +489,7 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
Map<String,Object> userMap = new HashMap<>();
userMap.put("userId",user.getUserId());
userMap.put("userName",user.getUserName());
userMap.put("userPhone",user.getUserPhone());
userMap.put("userPhone",Convert.toStr(user.getUserPhone(),""));
userMap.put("state",false);
userList.add(userMap);
}