修改项目列表

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

@@ -24,6 +24,7 @@ public class ProjectVO extends Project {
     private Integer userId;
     private String companyName;
     private String powerString;
+    private String username;
 
 
 }

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

@@ -17,7 +17,7 @@ public class UserVO extends User {
     private String keyName;//项目名称
     private Integer searchType;//搜索类型0-模具编号，1-模具名称
     private Integer projectId;
-    private Integer companyId;
+    private Integer cId;
     private String token;
     private Integer isManager = 0;
     private String powers;

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

@@ -48,20 +48,23 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
         HttpRespMsg msg = new HttpRespMsg();
         List<ProjectVO> list = new ArrayList<>();
         Integer type = 0;
-        PageHelper.startPage(page.getPageNum(), page.getPageSize());
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        System.out.println("user"+user);
         QueryWrapper<Project> qw = new QueryWrapper<>();
         Integer count = projectMapper.selectCount(qw.eq("manager_id", user.getId()));
         BeanUtils.copyProperties(user, userVO);
+        System.out.println("userVO"+userVO);
         if (user != null) {
             if (Constant.SYS_PARENT_ID == user.getParentId()) {
                 //平台超级管理员
                 msg.setError("对不起你不具备该项权限!");
             } else if (Constant.SYS_ID == user.getParentId()) {
                 //资产方管理员,展示此人创建所有项目对应的权限
+                PageHelper.startPage(page.getPageNum(), page.getPageSize());
                 list = projectMapper.selectUserPowerList(userVO, type);
             } else if (count > 0) {
                 //项目经理
+                PageHelper.startPage(page.getPageNum(), page.getPageSize());
                 type = 1;
                 list = projectMapper.selectUserPowerList(userVO, type);
             } else {

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

@@ -159,7 +159,7 @@
         <result column="company_name" property="companyName" />
         <result column="powerString" property="powerString" />
     </resultMap>
-    <select id="selectUserPowerList" resultMap="BaseResultMapPowerList">
+    <select id="selectUserPowerList1" resultMap="BaseResultMapPowerList">
       SELECT
       tbpu.user_id ,tbpu.project_id ,GROUP_CONCAT(tbpu.power_type) powerString,
         tbu.username ,tbc.company_name,
@@ -179,7 +179,7 @@
                 tbpu.project_id = #{user.projectId}
             </if>
             <if test="user.companyId != null">
-                tbpu.project_id = #{user.companyId}
+                tbu.company_id = #{user.companyId}
             </if>
             <if test="user.keyName != null and user.keyName != ''">
                 tbu.username like concat('%',#{user.keyName},'%')
@@ -200,46 +200,61 @@
         <result column="project_name" property="projectName" />
         <result column="project_id" property="projectId" />
         <result column="user_id" property="userId" />
+        <result column="username" property="username" />
         <result column="company_name" property="companyName" />
         <result column="powerString" property="powerString" />
-        <collection property="customCompanies" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.CustomCompany"
-                    select="queryPowerByUserIdAndProject" column="{id,user_id}">
+        <collection property="powers" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.Power"
+                    select="queryPowerByUserIdAndProject" column="{project_id,user_id}">
         </collection>
     </resultMap>
+    <resultMap id="BasePower" type="com.hssx.cloudmodel.entity.Power">
+        <result column="power_type" property="powerType" />
+        <result column="user_id" property="userId" />
+        <result column="project_id" property="projectId" />
+    </resultMap>
     
-    <select id="">
+    <select id="selectUserPowerList" resultMap="BaseResultMapPower">
         SELECT
-        tbpu.user_id ,tbpu.project_id ,GROUP_CONCAT(tbpu.power_type) powerString,
-        tbu.username ,tbc.company_name,
+        tbpu.user_id user_id,tbpu.project_id project_id,tbu.username username,tbc.company_name,
         tbp.project_name
-        FROM `tb_power` tbpu
-        left join
+        FROM
+        `tb_project_user` tbpu
+        LEFT JOIN
         tb_project tbp
-        on tbp.id = tbpu.project_id
-        left join
+        ON tbp.id = tbpu.project_id
+        LEFT JOIN
         tb_user tbu
-        on tbpu.user_id = tbu.id
-        left join
+        ON tbpu.user_id = tbu.id
+        LEFT JOIN
         tb_company tbc
-        on tbc.id = tbu.company_id
+        ON tbc.id = tbu.company_id
         <where>
-            <if test="user.projectId != null">
-                tbpu.project_id = #{user.projectId}
+            <if test="user.projectId != null and user.projectId !=''">
+               AND tbpu.project_id = #{user.projectId}
             </if>
-            <if test="user.companyId != null">
-                tbpu.project_id = #{user.companyId}
+            <if test="user.cId != null and user.cId !=''">
+                AND tbu.company_id = #{user.cId}
             </if>
             <if test="user.keyName != null and user.keyName != ''">
-                tbu.username like concat('%',#{user.keyName},'%')
+                AND tbu.username like concat('%',#{user.keyName},'%')
             </if>
             <if test="type == 0">
-                tbp.creator_id = #{user.id}
+                AND tbp.creator_id = #{user.id}
             </if>
             <if test="type == 1">
-                tbp.manager_id = #{user.id}
+                AND tbp.manager_id = #{user.id}
             </if>
         </where>
-        GROUP BY tbpu.user_id ,tbpu.project_id;
-        order by tbpu.user_id
+    </select>
+    <!--一对多的子查询 queryCustomCompaniesId-->
+    <select id="queryPowerByUserIdAndProject" resultMap="BasePower">
+    SELECT
+    tbpw.user_id,tbpw.project_id,tbpw.power_type
+     from
+     `tb_power` tbpw
+    WHERE
+    tbpw.project_id = #{project_id}
+    and
+    tbpw.user_id  =#{user_id}
     </select>
 </mapper>