修改role

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

@@ -4,6 +4,7 @@ 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,5 +18,5 @@ import java.util.List;
  */
 public interface ProjectMapper extends BaseMapper<Project> {
 
-    List<Project> getProjectListByUid(PageUtil page, String keyName, User currentUser);
+    List<Project> getProjectListByUid(@Param("keyName") String keyName, @Param("currentUser") User currentUser);
 }

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

@@ -29,10 +29,20 @@
 
     <select id="getProjectListByUid" resultMap="BaseResultMap">
         select
-          id,project_name, creator,owner_company,owner_company_name,customer_company,customer_company_name,charger,indate
+        p.id id,p.project_name project_name, p.creator creator,p.owner_company owner_company,
+        p.owner_company_name owner_company_name,p.customer_company customer_company,
+        p.customer_company_name customer_company_name,p.charger charger,p.indate indate
         from
            tb_project p
-        left join
-
+        left join tb_project_user pu
+        on p.id = pu.project_id
+        <where>
+            <if test="currentUser.id != 1">
+            pu.user_id = #{currentUser.id}
+            </if>
+            <if test="keyName != null and keyName != ''">
+                p.project_name like concat('%',#{keyName},'%')
+            </if>
+        </where>
     </select>
 </mapper>

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

@@ -34,7 +34,7 @@
 
     <select id="selectIdAndNamelist" resultMap="BaseResultMap">
         select
-          id, role_name
+          id, role_name,subordinate
         from
           tb_role
     </select>