This commit is contained in:
pengjie 2023-12-15 08:58:39 +08:00
parent 398306fa7c
commit e1d6bf6045

View File

@ -17,6 +17,7 @@ import com.zhgd.xmgl.security.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.SecurityUtil;
import com.zhgd.xmgl.util.ListUtils; import com.zhgd.xmgl.util.ListUtils;
import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.ParamEnum;
import com.zhgd.xmgl.util.TreeUtil; import com.zhgd.xmgl.util.TreeUtil;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -222,12 +223,10 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
List<EnterpriseMain> enterpriseMainList = new ArrayList<>(); List<EnterpriseMain> enterpriseMainList = new ArrayList<>();
if (systemRole.getSysDefault() == 1) { if (systemRole.getSysDefault() == 1) {
EnterpriseMain enterpriseMain = new EnterpriseMain(); EnterpriseMain enterpriseMain = new EnterpriseMain();
if (systemRole.getRoleCode().equals("BUILD")) { for (ParamEnum.EngineeringMain type : ParamEnum.EngineeringMain.values()) {
enterpriseMain.setMainType(1); if (systemRole.getRoleCode().equals(type)) {
} else if (systemRole.getRoleCode().equals("SUPERVISOR")) { enterpriseMain.setMainType(type.getValue());
enterpriseMain.setMainType(2); }
} else if (systemRole.getRoleCode().equals("OP")) {
enterpriseMain.setMainType(3);
} }
enterpriseMainList.add(enterpriseMain); enterpriseMainList.add(enterpriseMain);
} else if (accountType == 3) { } else if (accountType == 3) {
@ -255,12 +254,10 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
} else { } else {
for (EnterpriseMain main : enterpriseMainList) { for (EnterpriseMain main : enterpriseMainList) {
String code = ""; String code = "";
if (main.getMainType() == 1) { for (ParamEnum.EngineeringMain type : ParamEnum.EngineeringMain.values()) {
code = "BUILD"; if (main.getMainType() == type.getValue()) {
} else if (main.getMainType() == 2) { code = type.toString();
code = "SUPERVISOR"; }
} else if (main.getMainType() == 3) {
code = "OP";
} }
String iRoleId = systemRoleService.getOne(Wrappers.<SystemRole>lambdaQuery() String iRoleId = systemRoleService.getOne(Wrappers.<SystemRole>lambdaQuery()
.eq(SystemRole::getRoleCode, code)).getRoleId(); .eq(SystemRole::getRoleCode, code)).getRoleId();