role(add)

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/RoleController.java

@@ -61,4 +61,11 @@ public class RoleController extends BaseController {
     }
 
 
+    @ApiOperation(value = "角色管理-当前角色绑定了那些账号")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("roleAccountList")
+    public ResultBody roleAccountList(@ApiParam(value = "角色id", required = true) @RequestParam Integer id) {
+        return roleService.roleAccountList(id);
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/RoleDao.java

@@ -33,5 +33,7 @@ public interface RoleDao {
     Integer countRoleNameId(RoleInfoDO rd);
 
     Integer countNotDelUserAccountByRole(Integer id);
+
+    List<RoleInfoDO> roleAccountList(Integer id);
 }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/RoleService.java

@@ -20,4 +20,6 @@ public interface RoleService {
     ResultBody removeRoleInfo(Integer id);
 
     PageResult listPageRoleInfo(RoleInfoQO param, LoginSuccessDTO userLoginInfoFromRedis);
+
+    ResultBody roleAccountList(Integer id);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/RoleServiceImpl.java

@@ -13,6 +13,7 @@ import com.mmc.iuav.user.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -76,5 +77,11 @@ public class RoleServiceImpl implements RoleService {
                 }).collect(Collectors.toList()));
     }
 
+    @Override
+    public ResultBody roleAccountList(Integer id) {
+        List<RoleInfoDO> roleInfoDOS = roleDao.roleAccountList(id);
+        return ResultBody.success(roleInfoDOS);
+    }
+
 
 }

csm-service/cms-service-user/src/main/resources/mapper/RoleDao.xml

@@ -17,6 +17,7 @@
         <result property="userAccountId" column="user_account_id"/>
         <result property="userName" column="user_name"/>
         <result property="updateTime" column="update_time"/>
+        <result property="userName" column="user_name"/>
     </resultMap>
 
 
@@ -132,8 +133,19 @@
     </select>
 
     <select id="countNotDelUserAccountByRole" resultType="java.lang.Integer">
-        select count(*)
-        from user_role_rel
-        where role_id = #{id}
+        SELECT count(*)
+        FROM user_role_rel ur
+                 INNER JOIN user_account ua ON ur.user_account_id = ua.id
+        WHERE ur.role_id = #{id}
+          AND ua.is_deleted = 0
+    </select>
+
+    <select id="roleAccountList" resultMap="roleInfoResultMap">
+        SELECT urr.user_account_id,
+               ua.user_name
+        FROM user_role_rel urr
+                 LEFT JOIN user_account ua ON ua.id = urr.user_account_id
+        WHERE urr.role_id = #{id}
+          AND ua.is_deleted = 0
     </select>
 </mapper>