修改添加项目

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

@@ -69,7 +69,7 @@ public class ProjectController{
 
     /**
      * 分配项目
-     * 参数：id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)
+     * 参数: pageNum 当前页码，pageSize 每页条数 keyName 关键字查询 token 用户唯一凭证
      *
      * @return
      */
@@ -77,7 +77,8 @@ public class ProjectController{
     @RequestMapping("/list")
     @ResponseBody
     public HttpRespMsg handOutProject(String keyName, PageUtil page, String token) {
-        HttpRespMsg msg = projectService.getList(keyName,page);
+        User currentUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        HttpRespMsg msg = projectService.getList(keyName,page,currentUser);
         return msg;
     }
 

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

@@ -91,7 +91,7 @@ public class UserController {
      * 参数：account 账号 username 用户名（账号使用者的名字）
      * password 密码 ,mobile 手机号 ,roleType 角色类型, companyId 所属公司id
      * teamName 团体名称 ：客户方、供应方
-     * flag 0-添加，1-修改
+     * flag 0-添加，1-修改 subordinateType 所属团队 0-供应商 1-客户
      * @return
      */
     @ApiOperation("添加/修改用户")

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

@@ -2,6 +2,10 @@ package com.hssx.cloudmodel.mapper;
 
 import com.hssx.cloudmodel.entity.Project;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.util.PageUtil;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProjectMapper extends BaseMapper<Project> {
 
+    List<Project> getProjectListByUid(PageUtil page, String keyName, User currentUser);
 }

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

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

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

@@ -97,17 +97,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getList(String keyName,PageUtil page) {
+    public HttpRespMsg getList(String keyName,PageUtil page,User currentUser) {
         HttpRespMsg msg = new HttpRespMsg();
+        if(currentUser != null){
+            PageHelper.startPage(page.getPageNum(),page.getPageSize());
+            List<Project> projects = projectMapper.getProjectListByUid(page,keyName,currentUser);
+            PageInfo<Project> pageInfos = new PageInfo<>(projects);
+            msg.data = pageInfos;
+        }else{
+            msg.setError("当前用户不存，或涉及到权限问题，请重新登录");
+        }
         QueryWrapper<Project> qw = new QueryWrapper<>();
         qw.select("project_name", "creator","charger","indate");
         if(keyName != null){
             qw.like("project_name",keyName);
         }
-        PageHelper.startPage(page.getPageNum(),page.getPageSize());
-        List<Project> projects = projectMapper.selectList(qw);
-        PageInfo<Project> pageInfos = new PageInfo<>(projects);
-        msg.data = pageInfos;
+
         return msg;
     }
 }

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

@@ -27,4 +27,12 @@
         id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, customer_company, customer_company_name, indate, charger_id, charger
     </sql>
 
+    <select id="getProjectListByUid" resultMap="BaseResultMap">
+        select
+          id,project_name, creator,owner_company,owner_company_name,customer_company,customer_company_name,charger,indate
+        from
+           tb_project p
+        left join
+
+    </select>
 </mapper>

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

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