Merge remote-tracking branch 'origin/V0.1.0' into V0.1.0

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -271,6 +271,11 @@ public class SysRoleController extends BaseController {
         return success(roleService.getNamesByOrgId(orgId));
     }
 
+    @GetMapping("/getAllNames")
+    public AjaxResult getAllNames() {
+        return success(roleService.getAllNames());
+    }
+
     @GetMapping("/selectUserByRoleNameAndOrgId")
     public List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId, @RequestParam(value = "isLock") Integer isLock) {
         return roleService.selectUserByRoleNameAndOrgId(roleName, orgId, isLock);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysRoleMapper.java

@@ -120,5 +120,7 @@ String selectRoleNameByUserId(Long userId);
      */
     List<IdNameVo> getNamesByOrgId(Long orgId);
 
+    List<IdNameVo> getAllNames();
+
     List<SysRole> selectByRoleNames(@Param("list") List<String> list);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysRoleService.java

@@ -190,6 +190,8 @@ String selectRoleNameByUserId(Long userId);
 
     List<IdNameVo> getNamesByOrgId(Long orgId);
 
+    List<IdNameVo> getAllNames();
+
     List<SysRole> getRoleByType(String type) ;
 
     List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId,Integer isLock);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysRoleServiceImpl.java

@@ -459,6 +459,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
+    public List<IdNameVo> getAllNames() {
+        return baseMapper.getAllNames();
+    }
+
+    @Override
     public List<SysRole> getRoleByType(String type) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("del_flag", 0);

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -272,6 +272,12 @@
         where r.status=0
     </select>
 
+    <select id="getAllNames" resultType="com.xunmei.common.core.vo.IdNameVo">
+        select r.id,r.role_name as name
+        from sys_role r
+        where r.status=0
+    </select>
+
     <select id="selectByRoleNames" resultMap="SysRoleResult">
         select * from sys_role where del_flag=0 and role_name in
         <foreach collection="list" item="roleName" open="(" separator="," close=")">