修改listUserAndRoleByCompanyId bug

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

@@ -153,7 +153,7 @@ public class CompanyController extends BaseController {
     @ApiOperation(value = "根据公司id获取用户id和角色信息")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyInfoVO.class)})
     @GetMapping("listUserAndRoleByCompanyId")
-    public List<CompanyMemberVO> listUserAndRoleByCompanyId(@RequestParam Integer companyInfoId) {
+    public ResultBody listUserAndRoleByCompanyId(@RequestParam Integer companyInfoId) {
         return companyService.listUserAndRoleByCompanyId(companyInfoId);
     }
 }

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

@@ -176,5 +176,5 @@ public interface CompanyService {
 
     ResultBody insertUserRcd(Integer rUserId,List<Integer> userIds);
 
-    List<CompanyMemberVO> listUserAndRoleByCompanyId(Integer companyInfoId);
+    ResultBody listUserAndRoleByCompanyId(Integer companyInfoId);
 }

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

@@ -315,10 +315,10 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
-    public List<CompanyMemberVO> listUserAndRoleByCompanyId(Integer companyInfoId) {
+    public ResultBody listUserAndRoleByCompanyId(Integer companyInfoId) {
         List<CompanyMemberDO> companyMemberDOS = companyDao.selectUserAndRoleList(companyInfoId);
         List<CompanyMemberVO> companyMemberVOS = companyMemberDOS.stream().map(CompanyMemberDO::builCompanyMemberVO).collect(Collectors.toList());
-        return companyMemberVOS;
+        return ResultBody.success(companyMemberVOS);
     }
 
 

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

@@ -295,7 +295,7 @@
         WHERE cbu.back_user_account_id = #{backUserAccountId} and ci.is_deleted = 0
     </select>
     <select id="selectUserAndRoleList" resultType="com.mmc.iuav.user.entity.CompanyMemberDO">
-        SELECT me.user_account_id, me.is_leader, rol.role_name
+        SELECT me.user_account_id, me.is_leader as leader, rol.role_name
         FROM company_member me INNER JOIN company_role rol ON me.is_leader = rol.id
         where company_info_id = #{companyInfoId}
     </select>