用户角色菜单逻辑代码调整

src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteUserImpl.java

@@ -3,6 +3,7 @@ package com.hz.employmentsite.services.impl.baseSettings;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.PcSiteUserMapper;
+import com.hz.employmentsite.mapper.SysUserMapper;
 import com.hz.employmentsite.mapper.cquery.UserInfoCQuery;
 import com.hz.employmentsite.model.PcSiteUser;
 import com.hz.employmentsite.model.PcSiteUserExample;
@@ -28,6 +29,9 @@ public class SiteUserImpl implements SiteUserService {
 
     @Autowired
     private PcSiteUserMapper pcSiteUserMapper;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
     @Override
     public PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, String primaryKey, String userName) {
         PageHelper.startPage(pageIndex, pageSize);
@@ -98,6 +102,12 @@ public class SiteUserImpl implements SiteUserService {
             dbData.setUpdateTime(new Date());
             result = pcSiteUserMapper.updateByPrimaryKey(dbData);
         }
+        /*修改驿站人员角色时，同步修改已绑定的用户类型*/
+        if(data.userID!=null){
+            var curUserInfo=  sysUserMapper.selectByPrimaryKey(data.userID);
+            curUserInfo.setUserTypeID(data.roleID);
+            result += sysUserMapper.updateByPrimaryKey(curUserInfo);
+        }
         return result;
     }
 

src/main/java/com/hz/employmentsite/services/impl/system/RoleServiceImpl.java

@@ -49,21 +49,7 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public List<FunctionCodeModel> getFunctionCodeTreeList(String roleID, Integer userTypeID) {
 
-        String menuTopNo = "T01";
-        switch (userTypeID) {
-            case 1:
-                menuTopNo = "T01";
-                break;
-            case 2:
-                menuTopNo = "S01";
-                break;
-            case 3:
-                menuTopNo = "E01";
-                break;
-        }
-
-
-        List<FunctionCodeModel> dataList = roleCQuery.selectFunctionCodeList(roleID, menuTopNo);
+        List<FunctionCodeModel> dataList = roleCQuery.selectFunctionCodeList(roleID, "T01");
 
         List<FunctionCodeModel> result = dataList.stream().filter(e -> stringUtils.IsNullOrEmpty(e.parentFunctionCode)).collect(Collectors.toList());
 

src/main/java/com/hz/employmentsite/vo/baseSettings/SiteUserVo.java

@@ -9,6 +9,7 @@ public class SiteUserVo {
     public String siteUserID;
     public String siteID;
     public String siteUserName;
+    public String userID;
     public Integer gender;
     public String genderName;
     public String mobile;