项目下选择根据公司/所属团队筛选用户账号

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

@@ -1,8 +1,6 @@
 package com.hssx.cloudmodel.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hssx.cloudmodel.entity.Factory;
 import com.hssx.cloudmodel.entity.Project;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.ProjectService;
@@ -13,8 +11,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -76,11 +74,26 @@ public class ProjectController{
     @ApiOperation("项目列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg handOutProject(String keyName, PageUtil page, String token) {
+    public HttpRespMsg handOutProject(@RequestParam(required = false) String keyName, PageUtil page, String token) {
         User currentUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
         HttpRespMsg msg = projectService.getList(keyName,page,currentUser);
         return msg;
     }
 
+    /**
+     * 分配项目
+     * 参数: companyId 公司id，subordinateType 所属方 0-供应商 1-客户
+     * 以上两参数可以都不传，或者选择传其中一个
+     * @return
+     */
+    @ApiOperation("获取用户列表")
+    @RequestMapping("/getUserList")
+    @ResponseBody
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(User user) {
+        HttpRespMsg msg = projectService.getUserByCompanyIdOrSubordinateType(user);
+        return msg;
+    }
+
+
 }
 

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

@@ -6,10 +6,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-07-29
  */

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

@@ -17,10 +17,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * <p>
- * 前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-07-26
  */
@@ -33,7 +29,6 @@ public class RoleController {
 
     /**
      * 添加/修改角色
-     * @param role
      * 参数：roleName 角色名 dowloadPower 下载权限 0-无，1-有
      * uploadPower 上传权限 0-无，1-有 viewPower 浏览权限 0-无，1-有
      * approvalPower 审批权限 0-无，1-有
@@ -52,7 +47,6 @@ public class RoleController {
 
     /**
      * 删除角色
-     * @param role
      * 参数 id 角色id
      * @return
      */

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

@@ -24,10 +24,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
- * <p>
- * 前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-07-26
  */
@@ -122,7 +118,6 @@ public class UserController {
 
     /**
      * 删除角色
-     * @param user
      * 参数 id 角色id
      * @return
      */
@@ -158,6 +153,5 @@ public class UserController {
         }
         return msg;
     }
-
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/User.java

@@ -112,7 +112,7 @@ public class User extends Model<User> {
     private String teamName;
 
     /**
-     * 所属方，-1-超级管理员,0-供应商 1-客户方
+     * 所属方，0-供应商 1-客户方
      */
     @TableField("subordinate_type")
     private Integer subordinateType;

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

@@ -22,4 +22,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg handOutProject(Project project, String userIds);
 
     HttpRespMsg getList(String keyName,PageUtil page,User currentUser);
+
+    HttpRespMsg getUserByCompanyIdOrSubordinateType(User user);
 }

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

@@ -112,7 +112,21 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if(keyName != null){
             qw.like("project_name",keyName);
         }
+        return msg;
+    }
 
+    @Override
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(User user) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<User> users = new ArrayList<>();
+        QueryWrapper<User>qw = new QueryWrapper<>();
+        if(user.getCompanyId() != null){
+            qw.eq("company_id", user.getCompanyId());
+        }else if(user.getSubordinateType() != null){
+            qw.eq("subordinate_type", user.getSubordinateType());
+        }
+        users = userMapper.selectList(qw);
+        msg.data = users;
         return msg;
     }
 }