sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sxyanzhu:4ab19823f02e0cebe64f82e259f3a35a41f4bb4d
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:cfc468ac1f466e0596eef03eabc6c064156a58a0
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "4ab19823f02e0cebe64f82e259f3a35a41f4bb4d" and "cfc468ac1f466e0596eef03eabc6c064156a58a0" have entirely different histories.
4ab19823f0 ... cfc468ac1f

3 changed files with 28 additions and 33 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

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