Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

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

@@ -46,7 +46,35 @@
         <result column="company_name" property="companyName" />
         <result column="project_id" property="projectId" />
     </resultMap>
-
+    <select id="getProjectListByUid" resultMap="BaseResultMapList">
+        select
+        p.id id,p.project_name project_name, p.creator creator,p.owner_company owner_company,
+        p.owner_company_name owner_company_name,
+        p.indate indate
+        from
+        tb_project p
+        left join tb_project_user pu
+        on p.id = pu.project_id
+        <where>
+            <if test="currentUser.id != 1">
+                pu.user_id = #{currentUser.id} OR p.`creator_id` = #{currentUser.id} OR p.`manager_id` = #{currentUser.id}
+            </if>
+            <if test="keyName != null and keyName != ''">
+                p.project_name like concat('%',#{keyName},'%')
+            </if>
+        </where>
+        order by p.id desc
+    </select>
+    <!--一对多的子查询 queryCustomCompaniesId-->
+    <select id="queryCustomCompaniesId" resultMap="getCustomCompany">
+    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}
+    </select>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, indate, manager_id, manager
@@ -68,7 +96,6 @@
             <result column="model_name" property="modelName" />
         </collection>
         <collection property="approves" ofType="com.hssx.cloudmodel.entity.ProjectApprove">
-            <id column="id" property="id" />
             <result column="approver_id" property="approverId" />
             <result column="approver_name" property="approverName" />
             <result column="company_id" property="companyId" />
@@ -77,7 +104,6 @@
             <result column="project_id" property="projectId" />
         </collection>
         <collection property="customCompanies" ofType="com.hssx.cloudmodel.entity.CustomCompany">
-            <id column="id" property="id" />
             <result column="companyid" property="companyId" />
             <result column="companyname" property="companyName" />
             <result column="project_id" property="projectId" />
@@ -85,36 +111,6 @@
         </collection>
     </resultMap>
 
-    <select id="queryCustomCompaniesId" resultMap="getCustomCompany">
-    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}
-    </select>
-
-    <select id="getProjectListByUid" resultMap="BaseResultMapList">
-        select
-        p.id id,p.project_name project_name, p.creator creator,p.owner_company owner_company,
-        p.owner_company_name owner_company_name,
-        p.indate indate
-        from
-        tb_project p
-        left join tb_project_user pu
-        on p.id = pu.project_id
-        <where>
-            <if test="currentUser.id != 1">
-                pu.user_id = #{currentUser.id} OR p.`creator_id` = #{currentUser.id} OR p.`manager_id` = #{currentUser.id}
-            </if>
-            <if test="keyName != null and keyName != ''">
-                p.project_name like concat('%',#{keyName},'%')
-            </if>
-        </where>
-        order by p.id desc
-    </select>
-
     <select id="getProjectById" resultMap="BaseResultMapVO">
     select
         p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id,