Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-message

src/main/java/com/unissoft/config/MySecurityMetadataSource.java

@@ -51,7 +51,10 @@ public class MySecurityMetadataSource implements FilterInvocationSecurityMetadat
                     configAttributes2.add(securityConfig);
                     linkedHashMap.put(urlPattern1, configAttributes2);
                 } else {
-                    linkedHashMap.get(urlPattern1).add(securityConfig);
+                    Collection<ConfigAttribute> configAttributes = linkedHashMap.get(urlPattern1);
+                    if(!configAttributes.contains(securityConfig)){
+                        configAttributes.add(securityConfig);
+                    }
                 }
             }
         }

src/main/java/com/unissoft/mapper/SysResourceRoleMapper.xml

@@ -32,8 +32,9 @@ FROM
 	sys_resource t1
 LEFT JOIN project t2 ON t1.`se_project_id` = t2.`id`
 LEFT JOIN sys_resource_role t3 ON t1.`se_id` = t3.`resource_id`
+LEFT JOIN sys_role r ON t3.role_id = r.r_id
 WHERE
 	t2.`code` = #{projectCode}
-AND t1.se_button != '' AND t1.se_button IS NOT NULL
+AND t1.se_button != '' AND t1.se_button IS NOT NULL AND t1.se_button != '/'
     </select>
 </mapper>