Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

src/main/java/com/jeeplus/modules/sg/project/mapper/ProjectMapper.java

@@ -14,4 +14,5 @@ public interface ProjectMapper extends BaseMapper<WbsProject> {
     List<WbsProject> getList(WbsSelection wbsSelection);
     void updateNum(@Param("number") int number,@Param("id") String id);
 //    int update(WbsProject wbsProject);
+    List<WbsProject> findByName(String projectName);
 }

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ProjectMapper.xml

@@ -22,6 +22,24 @@
 		FROM sg_wbs_project a   left join sys_user b on a.create_by = b.id
 		WHERE a.id = #{id}
 	</select>
+
+	<select id="findByName" parameterType="String" resultType="WbsProject">
+		SELECT
+		a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+		a.project_name AS "projectName",
+		a.number AS "number"
+		FROM sg_wbs_project a
+		<where>
+			a.project_name = #{projectName} and a.number = 0
+		</where>
+		order by a.create_date DESC
+	</select>
 	
 	<select id="getList" resultType="WbsProject" parameterType="com.jeeplus.modules.sg.project.entity.WbsSelection" >
 		SELECT 

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -217,6 +217,7 @@ public class ProjectController extends BaseController {
     }
 
 
+
     /**
      * 创建项目ID
      */