Browse Source

2025-12-04

注释掉超级管理员判断逻辑
master
fengyuan_yang 1 month ago
parent
commit
af105cf1d8
  1. 50
      src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java

50
src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java

@ -98,19 +98,21 @@ public class ProjectServiceImpl implements ProjectService {
// // 存在角色编码为1的 即存在超级管理员
// inData.setRoleId(1);
// }
List<String> list = sysRoleDao.getSuperFlag(inData.getUserId());
boolean superFlag = false;
if (list != null) {
for (String s : list) {
if ("Y".equals(s)) {
superFlag = true;
break;
}
}
}
boolean shouldApplySuperFlagCondition = inData.getUserName() != null && !inData.getUserName().isEmpty() && !superFlag;
// 2025-12-04 注释掉超级管理员判断逻辑
// List<String> list = sysRoleDao.getSuperFlag(inData.getUserId());
// boolean superFlag = false;
// if (list != null) {
// for (String s : list) {
// if ("Y".equals(s)) {
// superFlag = true;
// break;
// }
// }
// }
// boolean shouldApplySuperFlagCondition = inData.getUserName() != null && !inData.getUserName().isEmpty() && !superFlag;
IPage<PlmProjectInfoData> resultList = this.projectDao.projectInfoSearch(
new Page<PlmProjectInfoData>(inData.getPage(), inData.getLimit()), inData, shouldApplySuperFlagCondition);
new Page<PlmProjectInfoData>(inData.getPage(), inData.getLimit()), inData, false);
return new PageUtils(resultList);
}
@ -610,23 +612,23 @@ public class ProjectServiceImpl implements ProjectService {
String orderClause = conditionMap.get("order");
whereClause = (whereClause.isEmpty() ? "site = '" + data.getSite() + "'" : whereClause + " AND site = '" + data.getSite() + "'").trim();
orderClause = orderClause.trim();
List<String> list = sysRoleDao.getSuperFlag(data.getUserId());
boolean superFlag = false;
if (list != null) {
for (String s : list) {
if ("Y".equals(s)) {
superFlag = true;
break;
}
}
}
boolean shouldApplySuperFlagCondition = data.getUserName() != null && !data.getUserName().isEmpty() && !superFlag;
// List<String> list = sysRoleDao.getSuperFlag(data.getUserId());
// boolean superFlag = false;
// if (list != null) {
// for (String s : list) {
// if ("Y".equals(s)) {
// superFlag = true;
// break;
// }
// }
// }
// boolean shouldApplySuperFlagCondition = data.getUserName() != null && !data.getUserName().isEmpty() && !superFlag;
Map<String, Object> params = new HashMap<>();
params.put("whereClause", whereClause);
params.put("orderClause", orderClause);
params.put("userName", data.getUserName());
params.put("site", data.getSite());
params.put("flag", shouldApplySuperFlagCondition);
params.put("flag", false);
IPage<PlmProjectInfoData> resultList = this.projectDao.projectInfoSearchByAnyField(new Page<PlmProjectInfoData>(data.getNo(), data.getSize()), params);
return new PageUtils(resultList);
}

Loading…
Cancel
Save