修改项目列表

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

@@ -100,6 +100,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 User customerExaminer = userMapper.selectById(customerApproverId);
                 Company company = companyMapper.selectById(customerExaminer.getCompanyId());
                 ProjectApprove projectApprove = new ProjectApprove();
+                projectApprove.setApproverId(customerExaminer.getId());
                 projectApprove.setApproverName(customerExaminer.getUsername());
                 projectApprove.setCompanyId(customerExaminer.getCompanyId());
                 projectApprove.setCompanyName(company.getCompanyName());
@@ -110,6 +111,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 User ownerExaminer = userMapper.selectById(ownerApproverId);
                 company = companyMapper.selectById(ownerExaminer.getCompanyId());
                 ProjectApprove ownerProjectApprove = new ProjectApprove();
+                projectApprove.setApproverId(ownerExaminer.getId());
                 ownerProjectApprove.setApproverName(ownerExaminer.getUsername());
                 ownerProjectApprove.setCompanyId(ownerExaminer.getCompanyId());
                 ownerProjectApprove.setCompanyName(company.getCompanyName());

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

@@ -204,7 +204,7 @@
         <result column="company_name" property="companyName" />
         <result column="powerString" property="powerString" />
         <collection property="powers" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.Power"
-                    select="queryPowerByUserIdAndProject" column="project_id">
+                    select="queryPowerByUserIdAndProject" column="{userId = user_id,projectId = project_id}">
         </collection>
     </resultMap>
     <resultMap id="BasePower" type="com.hssx.cloudmodel.entity.Power">
@@ -247,12 +247,14 @@
         </where>
     </select>
     <!--一对多的子查询 queryCustomCompaniesId-->
-    <select id="queryPowerByUserIdAndProject" resultMap="BasePower">
+    <select id="queryPowerByUserIdAndProject" resultMap="BasePower" parameterType="java.util.Map">
     SELECT
     tbpw.user_id,tbpw.project_id,tbpw.power_type
      from
      `tb_power` tbpw
     WHERE
-    tbpw.project_id = #{project_id}
+    tbpw.project_id = #{projectId}
+    and
+    tbpw.user_id  =#{userId}
     </select>
 </mapper>