Merge remote-tracking branch 'origin/master'

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

@@ -41,5 +41,20 @@ public class PowerController {
         return msg;
     }
 
+    /**
+     * 修改权限
+     * 参数 ：projectId 项目id ,id 用户id,token 用户凭证
+     *
+     * @return
+     */
+    @ApiOperation("权限列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(UserVO userVO,String token){
+        HttpRespMsg msg = powerService.updatePower(userVO,token);
+        return msg;
+    }
+
+
 }
 

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

@@ -17,4 +17,6 @@ import com.hssx.cloudmodel.util.PageUtil;
 public interface PowerService extends IService<Power> {
 
     HttpRespMsg getList(UserVO userVO,String token,PageUtil page);
+
+    HttpRespMsg updatePower(UserVO userVO, String token);
 }

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

@@ -74,4 +74,20 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg updatePower(UserVO userVO, String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Project> qw = new QueryWrapper<>();
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        if(user != null){
+//            Integer count = projectMapper.selectList(qw.eq("manager_id", user.getId()));
+//            if(){
+//
+//            }
+        }else{
+            msg.setError("用户不存或没登录!");
+        }
+        return null;
+    }
 }

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

@@ -36,15 +36,13 @@
         <result column="manager" property="manager" />
         <!--以下是分页插件的一对多-->
         <collection property="customCompanies" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.CustomCompany"
-                    select="queryCustomCompaniesId" column="id" >
+                    select="queryCustomCompaniesId" column="id" notNullColumn="company_id">
         </collection>
     </resultMap>
 <!-- 以上一对多的映射-->
     <resultMap id="getCustomCompany" type="com.hssx.cloudmodel.entity.CustomCompany">
-        <id column="id" property="id" />
         <result column="company_id" property="companyId" />
         <result column="company_name" property="companyName" />
-        <result column="project_id" property="projectId" />
     </resultMap>
     <select id="getProjectListByUid" resultMap="BaseResultMapList">
         select
@@ -71,10 +69,13 @@
     SELECT
      c.company_id company_id,c.company_name company_name
     from
-    tb_project p
-    left JOIN
-    tb_custom_company c
-    on c.project_id = p.id WHERE p.id = #{id}
+      tb_project p
+    RIGHT JOIN
+      tb_custom_company c
+    on
+      c.project_id = p.id
+    WHERE
+      p.id = #{id}
     </select>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -88,7 +89,7 @@
         <result column="creator_id" property="creatorId" />
         <result column="creator" property="creator" />
         <result column="is_delete" property="isDelete" />
-        <result column="indate" property="indate" />
+        <result column="pindate" property="indate" />
         <result column="manager_id" property="managerId" />
         <result column="manager" property="manager" />
         <collection property="models" ofType="com.hssx.cloudmodel.entity.Mould">
@@ -107,15 +108,13 @@
         <collection property="customCompanies" ofType="com.hssx.cloudmodel.entity.CustomCompany">
             <result column="companyid" property="companyId" />
             <result column="companyname" property="companyName" />
-            <result column="project_id" property="projectId" />
-            <result column="indate" property="indate" />
         </collection>
     </resultMap>
 
     <select id="getProjectById" resultMap="BaseResultMapVO">
     select
         p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id,p.manager_id manager_id,p.manager manager,
-        p.creator creator, p.owner_company owner_company,p.owner_company_name owner_company_name,p.indate indate,
+        p.creator creator, p.owner_company owner_company,p.owner_company_name owner_company_name,p.indate pindate,
         m.id model_id, m.model_no model_no,m.model_name model_name,a.approver_id approver_id,a.approver_name approver_name,a.subordinate_type subordinate_type,
         c.company_id companyid,c.company_name companyname
     from
@@ -165,7 +164,7 @@
       tbpu.user_id ,tbpu.project_id ,GROUP_CONCAT(tbpu.power_type) powerString,
         tbu.username ,tbc.company_name,
         tbp.project_name
-      FROM `tb_project_user` tbpu
+      FROM `tb_power` tbpu
       left join
       tb_project tbp
       on tbp.id = tbpu.project_id
@@ -195,17 +194,4 @@
       GROUP BY tbpu.user_id ,tbpu.project_id;
       order by tbpu.user_id
     </select>
-    <!--<resultMap id="PowerMap" type="com.hssx.cloudmodel.entity.Power">-->
-        <!--<id column="id" property="id" />-->
-        <!--<result column="power_type" property="powerType" />-->
-        <!--<result column="user_id" property="userId" />-->
-        <!--<result column="project_id" property="projectId" />-->
-        <!--<result column="indate" property="indate" />-->
-        <!--<result column="operating_documents_type" property="operatingDocumentsType" />-->
-    <!--</resultMap>-->
-    <!--&lt;!&ndash;以下是分页插件的一对多的子集sql&ndash;&gt;-->
-    <!--<select id="queryPowerListById" resultMap="PowerMap">-->
-
-    <!--</select>-->
-
 </mapper>