校园内模块相关

sapi/src/main/java/com/xhkjedu/sapi/controller/system/ModuleController.java

@@ -36,28 +36,29 @@ public class ModuleController {
      */
     @PostMapping("/list")
     public ResultVo listModules(@RequestBody TModule module){
-        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
-        List<TModule> lst = moduleService.listModules(module.getSchoolid(), module.getModuletype(), module.getDisplay());
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getBelong(),"模块归属",1});
+        List<TModule> lst = moduleService.listModules(module);
         return new ResultVo(0,"获取应用集合成功",lst);
     }
 
     @PostMapping("/list2")
     public ResultVo listModules2(@RequestBody TModule module){
-        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
-        List<TModule> lst = moduleService.listModules(module.getSchoolid(), module.getModuletype(), module.getDisplay());
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getBelong(),"模块归属",1});
+        List<TModule> lst = moduleService.listModules(module);
         return new ResultVo(0,"获取应用集合成功",lst);
     }
 
     //学生网页端模块获取
     @PostMapping("/list_stu")
     public ResultVo listStuModules(@RequestBody TModule module){
-        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
-        List<TModule> lst = moduleService.listModules(module.getSchoolid(),module.getModuletype(),1);
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getBelong(),"模块归属",1});
+        module.setDisplay(1);
+        List<TModule> lst = moduleService.listModules(module);
         return new ResultVo(0,"获取应用集合成功",lst);
     }
 
     /**
-     *功能描述 所有模块树形结构
+     *功能描述 所有模块树形结构 (主要用于学生平板获取权限、角色设置时获取所有)
      * @author WN
      * @date 2020/6/15
      * @param  * @param module
@@ -65,8 +66,17 @@ public class ModuleController {
      */
     @PostMapping("/treelst")
     public ResultVo listTree(@RequestBody TModule module){
-        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
-        List<TModule> lst = moduleService.listModulesTree(module.getSchoolid(),module.getModuletype(), 1);
+        //2023-06-25兼容现有app未更改字段  module.getModuletype(),"模块归属",1 ;
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1});
+        module.setDisplay(1);
+
+        if(N_Utils.isEmpty(module.getBelong())){
+            //代表是学生平板获取权限，兼容app未更改
+            module.setBelong(2);
+            module.setBelongcode(2);
+        }
+
+        List<TModule> lst = moduleService.listModulesTree(module);
         return new ResultVo(0,"获取应用集合成功",lst);
     }
 
@@ -85,8 +95,11 @@ public class ModuleController {
                 module.getMinout(),"应用分类",1,
                 module.getMclass(),"应用分组",1,
                 module.getSchoolid(),"学校id",1,
-                module.getModuletype(),"模块归属",1
+                module.getBelong(),"模块归属",1
         });
+        if(module.getLevel() == 2){
+            N_Utils.validation(new Object[]{module.getBelongcode(),"模块归属码",1 });
+        }
         int result = moduleService.add(module);
         if (result > 0) {
             return new ResultVo(0, "保存成功");
@@ -140,8 +153,8 @@ public class ModuleController {
      */
     @PostMapping("/listsel")
     public ResultVo listForSel(@RequestBody TModule module){
-        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
-        List<ModuleSelVo> lst = moduleService.listLevelModule(module.getSchoolid(),module.getModuletype());
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getBelong(),"模块归属",1});
+        List<ModuleSelVo> lst = moduleService.listLevelModule(module.getSchoolid(),module.getBelong());
         return new ResultVo(0,"获取一级应用成功",lst);
     }
 
@@ -157,9 +170,9 @@ public class ModuleController {
     @PostMapping("/listsel2")
     public ResultVo listForSel2(@RequestBody TModule module){
         Integer schoolid = module.getSchoolid();
-        Integer moduletype = module.getModuletype();
-        N_Utils.validation(new Object[]{schoolid,"学校id",1,moduletype,"模块归属",1});
-        List<Map> list = moduleService.listForSel2(schoolid, moduletype);
+        Integer belong = module.getBelong();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1,belong,"模块归属",1});
+        List<Map> list = moduleService.listForSel2(schoolid, belong,module.getBelongcode());
         return new ResultVo(0,"获取模块选择列表成功", list);
     }
 

sapi/src/main/java/com/xhkjedu/sapi/controller/system/ModuledefaultController.java

@@ -28,6 +28,9 @@ public class ModuledefaultController {
     @PostMapping("/add")
     public ResultVo add(@RequestBody TModuledefault tModuledefault) {
         N_Utils.validation(new Object[]{tModuledefault.getBelong(),"模块归属",1});
+        if(tModuledefault.getLevel() == 2){
+            N_Utils.validation(new Object[]{tModuledefault.getBelongcode(),"应用名称",1 });
+        }
         return moduledefaultService.save(tModuledefault);
     }
 

sapi/src/main/java/com/xhkjedu/sapi/controller/system/UserModuleController.java

@@ -30,12 +30,11 @@ public class UserModuleController {
     @PostMapping("/list")
     public ResultVo listModules(@RequestBody TUserModule userModule){
         N_Utils.validation(new Object[]{userModule.getUserid(),"用户id",1});
-        List<UserModuleVo> lst = userModuleService.listUserModules(userModule.getUserid());
+        List<UserModuleVo> lst = userModuleService.listUserModules(userModule.getUserid(),userModule.getBelongcode());
         return new ResultVo(0,"获取用户常用应用成功",lst);
     }
 
 
-
     /**
      *功能描述 保存
      * @author WN

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/ModuleMapper.java

@@ -22,14 +22,12 @@ public interface ModuleMapper extends TkMapper<TModule> {
      *功能描述 所有模块
      * @author WN
      * @date 2020/6/11
-     * @param  * @param schoolid
-     * @param display
      * @return java.util.List<com.xhkjedu.model.system.TModule>
      */
-    List<TModule> listModules(@Param("schoolid") Integer schoolid, @Param("moduletype") Integer moduletype, @Param("display") Integer display);
+    List<TModule> listModules(@Param("module") TModule module);
 
     //获取第一层模块
-    List<ModuleSelVo> listLevelModule(@Param("schoolid") Integer schoolid, @Param("moduletype") Integer moduletype);
+    List<ModuleSelVo> listLevelModule(@Param("schoolid") Integer schoolid, @Param("belong") Integer belong);
 
 
     /**
@@ -51,7 +49,7 @@ public interface ModuleMapper extends TkMapper<TModule> {
     void moveUp(@Param("list") List<TModule> modules);
 
     //模块选择列表
-    List<Map> listForSel2(@Param("schoolid") Integer schoolid, @Param("moduletype") Integer moduletype);
+    List<Map> listForSel2(@Param("schoolid") Integer schoolid, @Param("belong") Integer belong, @Param("belongcode")Integer belongcode);
 
     //删除默认模块关联的学校模块
     void deleteByDefaultId(String defaultid);
@@ -64,4 +62,7 @@ public interface ModuleMapper extends TkMapper<TModule> {
 
     //根据学校id获取管理员角色id
     Integer getRoleIdBySchoolId(@Param("schoolid") Integer schoolid);
+
+    //取指定模块对应的模块码
+    List<TModule> listModulesByModuleIds(@Param("list") List<String> list);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/UserModuleMapper.java

@@ -24,7 +24,7 @@ public interface UserModuleMapper extends TkMapper<TUserModule> {
      * @param  * @param userid
      * @return java.util.List<com.xhkjedu.vo.system.RoleModuleVo>
      */
-    List<UserModuleVo> listUserModules(@Param("userid") Integer userid);
+    List<UserModuleVo> listUserModules(@Param("userid") Integer userid,@Param("belongcode")Integer belongcode);
 
     /**
      *功能描述 批量保存用户模块信息

sapi/src/main/java/com/xhkjedu/sapi/model/system/TRoleModule.java

@@ -19,6 +19,9 @@ public class TRoleModule extends BaseBean {
     //模块表id
     private String moduleid;
 
+    //模块归属码1网页2app3网页+app
+    private Integer belongcode;
+
     //创建人id
     private Integer createid;
 

sapi/src/main/java/com/xhkjedu/sapi/model/system/TUserModule.java

@@ -24,6 +24,9 @@ public class TUserModule extends BaseBean {
     //排序
     private Integer umorder;
 
+    //模块归属码 1网页 2app 3网页+app
+    private Integer belongcode;
+
     //创建时间
     private Integer createtime;
 

sapi/src/main/java/com/xhkjedu/sapi/service/system/ModuleService.java

@@ -41,6 +41,9 @@ public class ModuleService {
         module.setModuleid(id);
         int timestamp = N_Utils.getSecondTimestamp();
         module.setCreatetime(timestamp);
+        if(module.getLevel() == 1) {
+            module.setBelongcode(3);
+        }
         int result = moduleMapper.insertSelective(module);
         Integer schoolid = module.getSchoolid();
         Integer createid = module.getCreateid();
@@ -52,6 +55,7 @@ public class ModuleService {
         rm.setCreateid(createid);
         rm.setCreatetime(timestamp);
         rm.setSchoolid(schoolid);
+        rm.setBelongcode(module.getBelongcode());
         roleModuleMapper.insertSelective(rm);
         return result;
     }
@@ -102,10 +106,9 @@ public class ModuleService {
      * @param display
      * @return java.util.List<com.xhkjedu.model.system.TModule>
      */
-    public List<TModule> listModules(Integer schoolid, Integer moduletype, Integer display){
-//        return moduleMapper.listModules(schoolid);
+    public List<TModule> listModules(TModule module){
         List<TModule> modules = new ArrayList<>();
-        List<TModule> lst = listModulesTree(schoolid,moduletype, display);
+        List<TModule> lst = listModulesTree(module);
         lst.forEach(m->{
             List<TModule> twomodules = m.getModulechilds();
             m.setModulechilds(null);
@@ -123,8 +126,8 @@ public class ModuleService {
     }
 
     //获取第一层模块
-    public List<ModuleSelVo> listLevelModule(Integer schoolid,Integer moduletype){
-        return moduleMapper.listLevelModule(schoolid,moduletype);
+    public List<ModuleSelVo> listLevelModule(Integer schoolid,Integer belong){
+        return moduleMapper.listLevelModule(schoolid,belong);
     }
 
     /**
@@ -135,8 +138,8 @@ public class ModuleService {
      * @param display
      * @return java.util.List<com.xhkjedu.model.system.TModule>
      */
-    public List<TModule> listModulesTree(Integer schoolid, Integer moduletype, Integer display){
-        List<TModule> lst = moduleMapper.listModules(schoolid,moduletype, display);
+    public List<TModule> listModulesTree(TModule module){
+        List<TModule> lst = moduleMapper.listModules(module);
 
         List<TModule> rtnlst = new ArrayList<>();
 
@@ -198,8 +201,8 @@ public class ModuleService {
     }
 
     //模块选择列表
-    public List<Map> listForSel2(Integer schoolid, Integer moduletype) {
-        return moduleMapper.listForSel2(schoolid, moduletype);
+    public List<Map> listForSel2(Integer schoolid, Integer belong,Integer belongcode) {
+        return moduleMapper.listForSel2(schoolid, belong,belongcode);
     }
 
     /**

sapi/src/main/java/com/xhkjedu/sapi/service/system/ModuledefaultService.java

@@ -46,6 +46,7 @@ public class ModuledefaultService {
         model.setCreatetime(N_Utils.getSecondTimestamp());
         if (model.getDisplay() == null) model.setDisplay(1);
         if (model.getMdefault() == null) model.setMdefault(0);
+        if (model.getLevel() == 1) model.setBelongcode(3);
         moduledefaultMapper.insertSelective(model);
 
         //当模块为一级（分类）时不需要给学校添加，是二级（模块）时给学校添加

sapi/src/main/java/com/xhkjedu/sapi/service/system/UserModuleService.java

@@ -1,18 +1,22 @@
 package com.xhkjedu.sapi.service.system;
 
+import com.xhkjedu.sapi.mapper.system.ModuleMapper;
 import com.xhkjedu.sapi.mapper.system.UserModuleMapper;
+import com.xhkjedu.sapi.model.system.TModule;
 import com.xhkjedu.sapi.model.system.TUserModule;
-import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.sapi.vo.system.UserModuleVo;
+import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName UserModuleService
@@ -23,12 +27,14 @@ import java.util.List;
 @Service
 @Slf4j
 public class UserModuleService {
-    @Autowired
+    @Resource
     private UserModuleMapper userModuleMapper;
+    @Resource
+    private ModuleMapper moduleMapper;
 
     //用户常用模块集合
-    public List<UserModuleVo> listUserModules(Integer userid){
-        return userModuleMapper.listUserModules(userid);
+    public List<UserModuleVo> listUserModules(Integer userid, Integer belongcode){
+        return userModuleMapper.listUserModules(userid,belongcode);
     }
 
     //保存
@@ -54,11 +60,18 @@ public class UserModuleService {
     //批量保存用户模块信息
     private Integer saveUserModule(List<String> moduleids,TUserModule userModule){
         List<TUserModule> lst = new ArrayList<>();
+
+        //获取所添加常用应用的模块码，
+        List<TModule> modulelist = moduleMapper.listModulesByModuleIds(moduleids);
+        Map<String,Integer> mapModule = modulelist.stream().collect(Collectors.toMap(TModule::getModuleid,TModule::getBelongcode));
+
         for(int i=0;i<moduleids.size();i++){
+            String mid = moduleids.get(i);
             TUserModule um = new TUserModule();
             BeanUtils.copyProperties(userModule,um);
-            um.setModuleid(moduleids.get(i));
+            um.setModuleid(mid);
             um.setUmorder(i+1);
+            um.setBelongcode(mapModule.get(mid));
 
             lst.add(um);
         }

sapi/src/main/resources/mapper/system/ModuleMapper.xml

@@ -6,27 +6,19 @@
     <select id="listModules" resultType="com.xhkjedu.sapi.model.system.TModule">
         SELECT m.moduleid,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.morder,m.minout,m.comm,
         m.mclass,m.level,m.createid,m.createtime,m.schoolid,u.username AS createname,m.mabbrevname
-        ,m.defaultid,m.mdefault,m.moduletype,m.display
+        ,m.defaultid,m.mdefault,m.belong,m.belongcode,m.display
         FROM t_module m LEFT JOIN t_user u ON m.createid=u.userid
-        WHERE m.schoolid=#{schoolid}
-        <choose>
-            <when test="moduletype==2 or moduletype==3">and m.moduletype in(#{moduletype},4)</when>
-            <when test="moduletype==5">and m.moduletype between 2 and 4</when>
-            <otherwise>and m.moduletype=#{moduletype}</otherwise>
-        </choose>
-        <if test="display!=null">and m.display=#{display}</if>
-        ORDER BY m.morder
+        WHERE m.schoolid=#{module.schoolid} and m.belong=#{module.belong}
+        <if test="module.belongcode!=null and module.belongcode==1">and m.belongcode in (1,3)</if>
+        <if test="module.belongcode!=null and module.belongcode==2">and m.belongcode in (2,3)</if>
+        <if test="module.display!=null">and m.display=#{module.display}</if>
+        ORDER BY m.morder,m.moduleid
     </select>
 
     <!-- 获取供第一层模块 -->
     <select id="listLevelModule" resultType="com.xhkjedu.sapi.vo.system.ModuleSelVo">
         SELECT moduleid,modulename,LEVEL FROM t_module
-        WHERE schoolid=#{schoolid} and LEVEL=1 and display=1
-        <choose>
-            <when test="moduletype==2 or moduletype==3">and moduletype in(#{moduletype},4)</when>
-            <when test="moduletype==5">and moduletype between 2 and 4</when>
-            <otherwise>and moduletype=#{moduletype}</otherwise>
-        </choose>
+        WHERE schoolid=#{schoolid} and LEVEL=1 and display=1 and belong=#{belong}
         order by morder,moduleid
     </select>
 
@@ -52,13 +44,10 @@
 
     <!--模块选择列表-->
     <select id="listForSel2" resultType="java.util.Map">
-        SELECT m.moduleid,m.modulename,m.mabbrevname,m.moduletype
-        FROM t_module m WHERE m.schoolid=#{schoolid} and m.level!=1
-        <choose>
-            <when test="moduletype==2 or moduletype==3">and m.moduletype in(#{moduletype},4)</when>
-            <when test="moduletype==5">and m.moduletype between 2 and 4</when>
-            <otherwise>and m.moduletype=#{moduletype}</otherwise>
-        </choose>
+        SELECT m.moduleid,m.modulename,m.mabbrevname,m.belong,m.belongcode
+        FROM t_module m WHERE m.schoolid=#{schoolid} and m.level!=1 and m.belong=#{belong}
+        <if test="belongcode!=null and belongcode==1">m.belongcode in (1,3)</if>
+        <if test="belongcode!=null and belongcode==2">m.belongcode in (2,3)</if>
         and m.display=1 ORDER BY m.morder,m.moduleid
     </select>
     <!--删除默认模块关联的学校模块-->
@@ -83,4 +72,12 @@
     <select id="getRoleIdBySchoolId" resultType="java.lang.Integer">
         select roleid from t_role where schoolid=#{schoolid} and roletype=0 limit 1
     </select>
+
+    <!--获取指定模块对应的模块码-->
+    <select id="listModulesByModuleIds" resultType="com.xhkjedu.sapi.model.system.TModule">
+        select moduleid,belongcode from t_module where moduleid in
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

sapi/src/main/resources/mapper/system/ModuledefaultMapper.xml

@@ -5,11 +5,12 @@
     <select id="listModulesByBelong" resultType="com.xhkjedu.sapi.model.system.TModule">
         SELECT m.moduleid,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.morder,m.minout
         ,m.comm,m.mclass,m.level,m.mabbrevname,m.mdefault,m.belong,m.belongcode,m.display
-        FROM t_moduledefault m where ((m.belong=#{belong}
-        <if test="belongcode!=null and belongcode!=0">and m.belongcode=#{belongcode}</if>)
-        or (m.belong=#{belong} and m.level=1))
+        FROM t_moduledefault m where m.belong=#{belong}
+        <if test="belongcode!=null and belongcode==1">and m.belongcode in (1,3)</if>
+        <if test="belongcode!=null and belongcode==2">and m.belongcode in (2,3)</if>
+
         <if test="display!=null">and m.display=#{display}</if>
-        group by m.moduleid ORDER BY m.morder
+        group by m.moduleid ORDER BY m.morder,m.moduleid
     </select>
 
     <!--获取所有模块-->

sapi/src/main/resources/mapper/system/UserModuleMapper.xml

@@ -5,14 +5,17 @@
     <select id="listUserModules" resultType="com.xhkjedu.sapi.vo.system.UserModuleVo">
         SELECT um.umid, um.moduleid,m.modulename,m.moduleurl,m.moduleico,m.minout,m.mabbrevname
         FROM t_user_module um LEFT JOIN t_module m ON um.moduleid=m.moduleid
-        WHERE um.userid=#{userid} and m.display=1 ORDER BY um.umorder
+        WHERE um.userid=#{userid} and m.display=1
+        <if test="belongcode!=null and belongcode==1">and um.belongcode in (1,3)</if>
+        <if test="belongcode!=null and belongcode==2">and um.belongcode in (2,3)</if>
+        ORDER BY um.umorder
     </select>
 
     <!-- 批量保存用户常用模块 -->
     <insert id="saveBathUserModule">
-        INSERT INTO t_user_module (userid,moduleid,umorder,createtime,schoolid) VALUES
+        INSERT INTO t_user_module (userid,moduleid,umorder,belongcode,createtime,schoolid) VALUES
         <foreach collection ="list" item="um" index= "index" separator =",">
-            (#{um.userid},#{um.moduleid},#{um.umorder},#{um.createtime},#{um.schoolid})
+            (#{um.userid},#{um.moduleid},#{um.umorder},#{um.belongcode},#{um.createtime},#{um.schoolid})
         </foreach>
     </insert>
 

suser/src/main/java/com/xhkjedu/suser/controller/system/RoleController.java

@@ -113,7 +113,10 @@ public class RoleController {
         N_Utils.validation(new Object[]{
                 userRole.getUserid(),"用户id",1
         });
-        List<RoleModuleVo> lst = roleService.listModulesByUserid(userRole.getUserid());
+        if(N_Utils.isEmpty(userRole.getBelongcode())){
+            userRole.setBelongcode(2);//兼容app未更改
+        }
+        List<RoleModuleVo> lst = roleService.listModulesByUserid(userRole.getUserid(),userRole.getBelongcode());
         return new ResultVo(0,"获取用户权限成功",lst);
     }
 

suser/src/main/java/com/xhkjedu/suser/mapper/system/RoleModuleMapper.java

@@ -51,5 +51,5 @@ public interface RoleModuleMapper extends TkMapper<TRoleModule> {
      * @param  * @param userid
      * @return java.util.List<com.xhkjedu.suser.vo.system.RoleModuleVo>
      */
-    List<RoleModuleVo> listModulesByUserid(@Param("userid")Integer userid);
+    List<RoleModuleVo> listModulesByUserid(@Param("userid")Integer userid,@Param("belongcode")Integer belongcode);
 }

suser/src/main/java/com/xhkjedu/suser/model/system/TRoleModule.java

@@ -19,6 +19,9 @@ public class TRoleModule extends BaseBean {
     //模块表id
     private String moduleid;
 
+    //模块归属码 1网页 2app 3网页+app
+    private Integer belongcode;
+
     //创建人id
     private Integer createid;
 

suser/src/main/java/com/xhkjedu/suser/model/system/TUserRole.java

@@ -29,4 +29,8 @@ public class TUserRole extends BaseBean {
     //用户姓名
     @Transient
     private String username;
+
+    //模块归属码1网页2app
+    @Transient
+    private Integer belongcode;
 }

suser/src/main/java/com/xhkjedu/suser/service/system/RoleService.java

@@ -69,6 +69,7 @@ public class RoleService {
             trm.setCreateid(role.getCreateid());
             trm.setCreatetime(N_Utils.getSecondTimestamp());
             trm.setSchoolid(role.getSchoolid());
+            trm.setBelongcode(3);
 
             lst.add(trm);
 
@@ -79,6 +80,7 @@ public class RoleService {
                 trm2.setCreateid(role.getCreateid());
                 trm2.setCreatetime(N_Utils.getSecondTimestamp());
                 trm2.setSchoolid(role.getSchoolid());
+                trm2.setBelongcode(child.getBelongcode());
 
                 lst.add(trm2);
             }
@@ -194,9 +196,9 @@ public class RoleService {
      * @param  * @param userid
      * @return java.util.List<com.xhkjedu.suser.vo.system.RoleModuleVo>
      */
-    public List<RoleModuleVo> listModulesByUserid(Integer userid){
+    public List<RoleModuleVo> listModulesByUserid(Integer userid,Integer belongcode){
 
-        List<RoleModuleVo> modules = roleModuleMapper.listModulesByUserid(userid);
+        List<RoleModuleVo> modules = roleModuleMapper.listModulesByUserid(userid,belongcode);
 
         return listRoleModuleForTree(modules);
     }

suser/src/main/java/com/xhkjedu/suser/vo/system/RoleModuleVo.java

@@ -42,6 +42,9 @@ public class RoleModuleVo {
     //级别1一级2二级
     private Integer level;
 
+    //模块归属码 1网页 2app 3网页+app
+    private Integer belongcode;
+
     //子模块
     List<RoleModuleVo> modulechilds = new ArrayList<>();
 

suser/src/main/resources/mapper/system/RoleModuleMapper.xml

@@ -4,16 +4,16 @@
 
     <!-- 角色下所有模块 -->
     <select id="listRoleModules" resultType="com.xhkjedu.suser.vo.system.RoleModuleVo">
-        SELECT rm.moduleid,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.minout,m.mclass,m.level
+        SELECT rm.moduleid,rm.belongcode,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.minout,m.mclass,m.level
         FROM t_role_module rm LEFT JOIN t_module m ON rm.moduleid=m.moduleid
         WHERE rm.roleid=#{roleid} and m.display=1 ORDER BY m.morder
     </select>
 
     <!-- 批量保存角色模块信息 -->
     <insert id="saveBathRoleModule">
-        INSERT INTO t_role_module (roleid,moduleid,createid,createtime,schoolid) VALUES
+        INSERT INTO t_role_module (roleid,moduleid,belongcode,createid,createtime,schoolid) VALUES
         <foreach collection ="list" item="rm" index= "index" separator =",">
-            (#{rm.roleid},#{rm.moduleid},#{rm.createid},#{rm.createtime},#{rm.schoolid})
+            (#{rm.roleid},#{rm.moduleid},#{rm.belongcode},#{rm.createid},#{rm.createtime},#{rm.schoolid})
         </foreach>
     </insert>
 
@@ -28,6 +28,9 @@
         m.mclass,m.level,m.mabbrevname
         FROM t_role_module rm LEFT JOIN t_module m ON rm.moduleid=m.moduleid
         LEFT JOIN t_user_role ur ON rm.roleid=ur.roleid
-        WHERE userid=#{userid} and m.display=1 ORDER BY m.level,m.morder,m.moduleid
+        WHERE userid=#{userid} and m.display=1
+        <if test="belongcode!=null and belongcode == 1">and rm.belongcode in (1,3)</if>
+        <if test="belongcode!=null and belongcode == 2">and rm.belongcode in (2,3)</if>
+        ORDER BY m.level,m.morder,m.moduleid
     </select>
 </mapper>