项目列表展示，名字去重

src/main/java/com/yipin/liuwanr/mapper/Project_ManagementMapper.java

@@ -17,12 +17,12 @@ import com.yipin.liuwanr.entity.Role;
  * 项目管理系统 项目管理表
  *
  * @author 86151
- *
  */
 public interface Project_ManagementMapper {
 
     /**
      * 查询项目名称
+     *
      * @param projectName
      * @return
      */
@@ -39,9 +39,9 @@ public interface Project_ManagementMapper {
             "select projectId,projectName,projectPermissions,founder,creationTime,state from hr_project_management where isdel=0",
             " <if test='projectPermissions!=null'> and projectPermissions=#{projectPermissions}</if>",
             " <if test='founder!=null'> and founder=#{founder}</if>",
+            " <if test='userId!=null'> and (userId=#{userId} or founder = 0)</if>",
             " <if test='state!=null'> and state=#{state}</if>",
             " <if test='systemId!=null'> and systemId=#{systemId}</if>",
-			" <if test='userId!=null'> and userId=#{userId}</if>",
             " <if test='projectName!=null'> and projectName like concat('%',#{projectName},'%')</if>",
             " ORDER BY creationTime desc",
             "</script>"})
@@ -57,9 +57,18 @@ public interface Project_ManagementMapper {
     @Select("select projectId,projectName,projectPermissions,experimentalGoal,caseDescription,experimentSuggests,state,isstartexperimental,isstartexperimentSuggests,userId  from hr_project_management where isdel=0 and projectId=#{projectId}")
     Project_Management getProjectId(Integer projectId);
 
+    /**
+     * 根据实验项目id查询项目名称
+     *
+     * @param projectId
+     * @return
+     */
+    @Select("select projectName from hr_project_management where isdel=0 and projectId=#{projectId}")
+    String getNameByProjectId(Integer projectId);
 
     /**
      * 批量删除
+     *
      * @param projectId
      */
     @Update("<script>" + "<foreach collection = 'point' item ='projectId' open='' close='' separator=';'>"
@@ -90,6 +99,7 @@ public interface Project_ManagementMapper {
     /**
      * 点击编辑或者创建项目管理页面的保存按钮后,
      * 修改角色表中的对应数据的项目id
+     *
      * @param ids
      * @param projectId
      */
@@ -119,6 +129,7 @@ public interface Project_ManagementMapper {
     /**
      * 点击具体某个项目信息的编辑按钮,
      * 跳转到编辑项目管理页面的实验数据的信息展示
+     *
      * @param projectId
      * @return
      */
@@ -128,6 +139,7 @@ public interface Project_ManagementMapper {
 
     /**
      * 添加判分点面板的判分信息展示
+     *
      * @return
      */
     @Select({"<script>",
@@ -140,6 +152,7 @@ public interface Project_ManagementMapper {
     /**
      * 从判分点添加面板，选择完数据后，
      * 创建项目管理页面的实验任务信息展示
+     *
      * @param point
      * @return
      */
@@ -152,6 +165,7 @@ public interface Project_ManagementMapper {
     /**
      * 点击具体某个项目信息的编辑按钮,
      * 跳转到编辑项目管理页面的实验任务的信息展示
+     *
      * @param projectId
      * @return
      */
@@ -164,6 +178,7 @@ public interface Project_ManagementMapper {
 
     /**
      * 取出判分点中的项目管理的id
+     *
      * @param judgmentPointsId
      * @return
      */
@@ -172,6 +187,7 @@ public interface Project_ManagementMapper {
 
     /**
      * 点击保存按按，需要修改判分点表中对应的项目id,实验要求
+     *
      * @param projectId
      * @param judgmentPointsId
      */
@@ -189,7 +205,7 @@ public interface Project_ManagementMapper {
      * @param management
      */
     @Insert("INSERT INTO hr_project_management(projectName,projectPermissions,experimentalGoal,caseDescription,experimentSuggests,state,founder,systemId,creationTime,isstartexperimental,isstartexperimentSuggests,userId,isExperiment,isAttendance,isdel)"
-			+ " VALUES (#{projectName},#{projectPermissions},#{experimentalGoal},#{caseDescription},#{experimentSuggests},#{state},1,#{systemId},now(),#{isstartexperimental},#{isstartexperimentSuggests},#{userId},0,0,0)")
+            + " VALUES (#{projectName},#{projectPermissions},#{experimentalGoal},#{caseDescription},#{experimentSuggests},#{state},#{founder},#{systemId},now(),#{isstartexperimental},#{isstartexperimentSuggests},#{userId},0,0,0)")
     @Options(useGeneratedKeys = true, keyProperty = "projectId", keyColumn = "projectId")
     void insertProjectManagement(Project_Management management);
 
@@ -204,6 +220,7 @@ public interface Project_ManagementMapper {
 
     /**
      * 根据项目id,查询出该项目所有的判分点id
+     *
      * @param projectId
      * @return
      */
@@ -212,6 +229,7 @@ public interface Project_ManagementMapper {
 
     /**
      * 根据项目id,查询出该项目所有的角色id
+     *
      * @param projectId
      * @return
      */
@@ -221,6 +239,7 @@ public interface Project_ManagementMapper {
 
     /**
      * 查询用户角色
+     *
      * @param userId
      * @return
      */
@@ -230,6 +249,7 @@ public interface Project_ManagementMapper {
 
     /**
      * 查询用户角色
+     *
      * @param userId
      * @return
      */

src/main/java/com/yipin/liuwanr/service/Project_ManagementService.java

@@ -592,11 +592,16 @@ public class Project_ManagementService {
             }
             //项目名称去重
             String projectName = pro.getProjectName();
+
+            String name = mapper.getNameByProjectId(pro.getProjectId());
+            if (projectName != null && !projectName.equals(name)) {
                 Integer count = mapper.getByprojectName(projectName);
-            if (count != null) {
+                if (count != null && count > 1) {
                     projectName += (count + 1);
                     pro.setProjectName(projectName);
                 }
+            }
+
             //修改项目信息
             mapper.updateProjectManagement(pro);
             resp.put("retcode", 200);