用户列表

cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -2,8 +2,10 @@ package com.hssx.cloudmodel.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.Role;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.CompanyService;
+import com.hssx.cloudmodel.service.RoleService;
 import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.MD5Util;
@@ -37,6 +39,8 @@ public class UserController {
     private UserService userService;
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private RoleService roleService;
 
     /**
      *
@@ -63,7 +67,21 @@ public class UserController {
     @ResponseBody
     public HttpRespMsg getCompanyList(){
         HttpRespMsg msg = new HttpRespMsg();
-        List<Company> list = companyService.list();
+        List<Company> list = companyService.getIdAndNamelist();
+        msg.data = list;
+        return msg;
+    }
+
+    /**
+     * 创建账号是所获取的角色列表
+     * @return
+     */
+    @ApiOperation(value = "获取角色列表")
+    @RequestMapping("getRoleList")
+    @ResponseBody
+    public HttpRespMsg getRoleList(){
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Role> list = roleService.getIdAndNamelist();
         msg.data = list;
         return msg;
     }
@@ -72,7 +90,7 @@ public class UserController {
      *
      * 参数：account 账号 username 用户名（账号使用者的名字）
      * password 密码 ,mobile 手机号 ,roleType 角色类型, companyId 所属公司id
-     * team_name 团体名称 ：客户方、供应方
+     * teamName 团体名称 ：客户方、供应方
      * flag 0-添加，1-修改
      * @return
      */

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/CompanyMapper.java

@@ -18,4 +18,6 @@ import java.util.List;
 public interface CompanyMapper extends BaseMapper<Company> {
 
     List<Company> getListByKeyName(@Param("keyName") String keyName, @Param("start")Integer start, @Param("pageSize") Integer pageSize);
+
+    List<Company> selectIdAndNamelist();
 }

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/RoleMapper.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface RoleMapper extends BaseMapper<Role> {
 
     List<Role> getListByKeyName(@Param("keyName") String keyName,@Param("start")Integer start,@Param("pageSize") Integer pageSize);
+
+    List<Role> selectIdAndNamelist();
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -18,4 +20,6 @@ public interface CompanyService extends IService<Company> {
     HttpRespMsg addAndUpdateRole(Company company, Integer flag);
 
     HttpRespMsg pageList(PageUtil page, String keyName);
+
+    List<Company> getIdAndNamelist();
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/RoleService.java

@@ -1,10 +1,13 @@
 package com.hssx.cloudmodel.service;
 
+import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Role;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -18,4 +21,6 @@ public interface RoleService extends IService<Role> {
     HttpRespMsg addAndUpdateRole(Role role, Integer flag);
 
     HttpRespMsg pageList(PageUtil page, String keyName);
+
+    List<Role> getIdAndNamelist();
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -62,4 +62,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         msg.data = page;
         return msg;
     }
+
+    @Override
+    public List<Company> getIdAndNamelist() {
+        return companyMapper.selectIdAndNamelist();
+    }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java

@@ -62,4 +62,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
         msg.data = page;
         return msg;
     }
+
+    @Override
+    public List<Role> getIdAndNamelist() {
+        return roleMapper.selectIdAndNamelist();
+    }
 }

cloud-model/src/main/resources/mapper/CompanyMapper.xml

@@ -25,4 +25,11 @@
         </where>
         Limit #{start},#{pageSize}
     </select>
+    <select id="selectIdAndNamelist" resultMap="BaseResultMap">
+        select
+          id, company_name
+        from
+          tb_company
+    </select>
+
 </mapper>

cloud-model/src/main/resources/mapper/RoleMapper.xml

@@ -29,4 +29,13 @@
         </where>
         Limit #{start},#{pageSize}
     </select>
+    <select id="selectIdAndNamelist" resultMap="BaseResultMap">
+        select
+          id, role_name
+        from
+          tb_role
+    </select>
+
+
+
 </mapper>