权限设置界面返回结果增加moduleId

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/PowerDTO.java

@@ -6,6 +6,7 @@ public class PowerDTO {
     private Long groupId;
     private String moduleName;
     private String groupName;
+    private Long moduleId;
     private Boolean query;
     private Boolean add;
     private Boolean update;
@@ -17,6 +18,14 @@ public class PowerDTO {
     private Boolean fileImport;
     private List<OtherPowerDTO> other;
 
+    public Long getModuleId() {
+        return moduleId;
+    }
+
+    public void setModuleId(Long moduleId) {
+        this.moduleId = moduleId;
+    }
+
     public Long getGroupId() {
         return groupId;
     }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/po/PowerInfo.java

@@ -8,6 +8,23 @@ public class PowerInfo implements Serializable {
     private Long groupId;
     private String groupName;
     private String moduleName;
+    private Long moduleId;
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public Long getModuleId() {
+        return moduleId;
+    }
+
+    public void setModuleId(Long moduleId) {
+        this.moduleId = moduleId;
+    }
 
     public String getClassify() {
         return classify;

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/RoleServiceImpl.java

@@ -100,6 +100,7 @@ public class RoleServiceImpl extends CommonBaseServiceImpl<RoleMapper, Role> imp
             powerDTO.setGroupId(powerInfo.getGrougId());
             powerDTO.setModuleName(powerInfo.getModuleName());
             powerDTO.setGroupName(powerInfo.getGroupName());
+            powerDTO.setModuleId(powerInfo.getModuleId());
             //赋值默认权限,在权限列表中的资源默认置为false
             setPowerValue(powerDTO, powerInfo.getClassify(), false);
             //赋值权限

base-servers/account/account-server/src/main/resources/mapper/RoleResourceMapper.xml

@@ -32,12 +32,13 @@
         GROUP BY GROUP_ID
     </select>
     <select id="selectPowerInfo" parameterType="java.lang.Long" resultType="com.usoftchina.saas.account.po.PowerInfo">
-        SELECT GROUP_CONCAT(classify) classify,group_id groupId,groupname,modulename FROM (
-          SELECT classify,group_id,s.name groupname,M.NAME modulename FROM AC_RESOURCE R
+        SELECT GROUP_CONCAT(classify) classify,group_id groupId,groupname,moduleId,modulename FROM (
+          SELECT classify,group_id,s.name groupname,M.NAME modulename,M.id moduleId FROM AC_RESOURCE R
 				LEFT JOIN AC_RESOURCE_GROUP S ON R.GROUP_ID = S.ID
 				LEFT JOIN AC_RESOURCE_MODULE M ON S.MODULE_ID = M.ID
-          GROUP BY GROUP_ID,CLASSIFY,s.name,M.NAME) A
-        GROUP BY GROUP_ID,groupname,modulename
+          GROUP BY GROUP_ID,CLASSIFY,s.name,M.NAME,M.id) A
+        GROUP BY GROUP_ID,groupname,modulename,moduleId
+		ORDER BY MODULEID
     </select>
     <resultMap id="OtherPowerResultMap" type="com.usoftchina.saas.account.po.OtherPower">
         <result column="name" property="name" jdbcType="VARCHAR" />