Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java

@@ -52,7 +52,7 @@ public class ProjectUserinfoController extends BaseController {
      * @return
      */
     @GetMapping("/queryAllProjectUserByParams")
-    public AjaxResult queryAllProjectUserByParams(@RequestParam Long projectId, String loginName){
-        return success(surProjectUserinfoService.queryAllProjectUserInfo(projectId,loginName));
+    public AjaxResult queryAllProjectUserByParams(@RequestParam Long projectId, String loginName,String selectMy){
+        return success(surProjectUserinfoService.queryAllProjectUserInfo(projectId,loginName,selectMy));
     }
 }

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java

@@ -55,7 +55,7 @@ public interface ISurProjectUserinfoService
      * @param loginName 项目用户
      * @return 项目用户集合
      */
-    public List<SurProjectUnitInfo> queryAllProjectUserInfo(Long projectId, String loginName);
+    public List<SurProjectUnitInfo> queryAllProjectUserInfo(Long projectId, String loginName, String selectMy);
 
     /**
      * 新增项目用户

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.common.enums.PublicStateEnum;
 import com.ruoyi.common.enums.SysRoleEnum;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
@@ -138,7 +139,7 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
      * @return 项目用户集合
      */
     @Override
-    public List<SurProjectUnitInfo> queryAllProjectUserInfo(Long projectId, String loginName) {
+    public List<SurProjectUnitInfo> queryAllProjectUserInfo(Long projectId, String loginName,String selectMy) {
         String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleIdByLoginName(loginName));
         //查询出公司信息
         SurProjectUnitInfo surProjectUnitInfo = new SurProjectUnitInfo();
@@ -147,33 +148,37 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
         List<SurProjectUserinfo> projectUserList;
         SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo();
         surProjectUserinfo.setProjectId(projectId);
-        surProjectUserinfo.setCreateBy(loginName);
+        if(!Objects.equals(PublicStateEnum.YES.getCode(),selectMy)){
+            surProjectUserinfo.setCreateBy(loginName);
+        }
         //根据项目主键查询所有项目人员
         projectUserList = surProjectUserinfoMapper.selectSurProjectUserinfoList(surProjectUserinfo);
         //根据角色查询项目单位人员信息
-        if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) || SysRoleEnum.ZGS.getCode().equals(nowRole)){
-            surProjectUserinfo.setRoleId(SysRoleEnum.ZGS.getCode());
-            //查询所属项目部门信息
-            SysDept sysDept = deptMapper.selectDeptByProjectId(projectId);
-            surProjectUserinfo.setDeptId(sysDept.getDeptId());
-        }else if(SysRoleEnum.JLDW.getCode().equals(nowRole)){
-            //监理单位只能选择监理单位
-            surProjectUserinfo.setRoleId(SysRoleEnum.JLDW.getCode());
-            //查询部门信息
-            SysDept sysDept = deptMapper.selectDeptByUserName(loginName);
-            surProjectUserinfo.setDeptId(sysDept.getDeptId());
-        }else if(SysRoleEnum.ZBDW.getCode().equals(nowRole)){
-            //总包单位只能选择总包单位
-            surProjectUserinfo.setRoleId(SysRoleEnum.ZBDW.getCode());
-            //查询部门信息
-            SysDept sysDept = deptMapper.selectDeptByUserName(loginName);
-            surProjectUserinfo.setDeptId(sysDept.getDeptId());
-        }else if(SysRoleEnum.FBDW.getCode().equals(nowRole)){
-            //分包单位只能选择分包单位
-            surProjectUserinfo.setRoleId(SysRoleEnum.FBDW.getCode());
-            //查询部门信息
-            SysDept sysDept = deptMapper.selectDeptByUserName(loginName);
-            surProjectUserinfo.setDeptId(sysDept.getDeptId());
+        if(Objects.equals(PublicStateEnum.YES.getCode(),selectMy)){
+            if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) || SysRoleEnum.ZGS.getCode().equals(nowRole)){
+                surProjectUserinfo.setRoleId(SysRoleEnum.ZGS.getCode());
+                //查询所属项目部门信息
+                SysDept sysDept = deptMapper.selectDeptByProjectId(projectId);
+                surProjectUserinfo.setDeptId(sysDept.getDeptId());
+            }else if(SysRoleEnum.JLDW.getCode().equals(nowRole)){
+                //监理单位只能选择监理单位
+                surProjectUserinfo.setRoleId(SysRoleEnum.JLDW.getCode());
+                //查询部门信息
+                SysDept sysDept = deptMapper.selectDeptByUserName(loginName);
+                surProjectUserinfo.setDeptId(sysDept.getDeptId());
+            }else if(SysRoleEnum.ZBDW.getCode().equals(nowRole)){
+                //总包单位只能选择总包单位
+                surProjectUserinfo.setRoleId(SysRoleEnum.ZBDW.getCode());
+                //查询部门信息
+                SysDept sysDept = deptMapper.selectDeptByUserName(loginName);
+                surProjectUserinfo.setDeptId(sysDept.getDeptId());
+            }else if(SysRoleEnum.FBDW.getCode().equals(nowRole)){
+                //分包单位只能选择分包单位
+                surProjectUserinfo.setRoleId(SysRoleEnum.FBDW.getCode());
+                //查询部门信息
+                SysDept sysDept = deptMapper.selectDeptByUserName(loginName);
+                surProjectUserinfo.setDeptId(sysDept.getDeptId());
+            }
         }
         //查询相关人员
         List<SurProjectUserinfo> deptUserList = new ArrayList<>();