Merge branch 'release'

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -51,6 +51,7 @@ public enum RequirePermissionEnum {
     ORG_STAFF_CREATE("org_staff_create", "组织:工作人员:新增", "组织:工作人员:新增"),
     ORG_STAFF_UPDATE("org_staff_update", "组织:工作人员:编辑", "组织:工作人员:编辑"),
     ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织:工作人员:禁用", "组织:工作人员:禁用"),
+    ORG_STAFF_TRANSFER("org_staff_transfer", "组织:工作人员:调动", "组织:工作人员:调动"),
 
     /**
      * 组织-部门

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java

@@ -51,7 +51,7 @@ public class ProjectDetailResultDTO implements Serializable {
 	/**
 	 * 是否是转项目节点
 	 */
-	private Boolean isCreated;
+	private Boolean returnable;
 	/**
 	 * 当前跟进部门
 	 */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -266,7 +266,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);
-			resultDTO.setIsCreated(false);
+			resultDTO.setReturnable(false);
 		} else {
 			//获取我未处理的部门
 			ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
@@ -278,11 +278,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			} else {
 				resultDTO.setProcessable(false);
 			}
-			List<String> created = projectStaffService.getCreatedProcess(projectStaffDTO);
+			ReturnListFromDTO returnListFromDTO = new ReturnListFromDTO();
-			if (null != created && created.size() > NumConstant.ZERO) {
+			returnListFromDTO.setProjectId(fromDTO.getProjectId());
-				resultDTO.setIsCreated(true);
+			List<ReturnListResultDTO> returnableList = projectProcessService.getReturnableList(returnListFromDTO);
+			if (null != returnableList && returnableList.size() > NumConstant.ZERO) {
+				resultDTO.setReturnable(true);
 			} else {
-				resultDTO.setIsCreated(false);
+				resultDTO.setReturnable(false);
 			}
 		}
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml

@@ -62,7 +62,7 @@
         WHERE
             ps.DEL_FLAG = '0'
           AND ps.PROJECT_ID = #{projectId}
-          AND STAFF_ID = #{staffId}
+          AND ps.STAFF_ID = #{staffId}
           AND IS_HANDLE = 'unhandled'
     </select>
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java

@@ -108,6 +108,6 @@ public class UserWechatDTO implements Serializable{
      */
     private Date updatedTime;
 
-    @JsonIgnore
+    //@JsonIgnore
     private String sessionKey;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java

@@ -82,7 +82,7 @@ public class InfoSubmitFromDTO implements Serializable {
 	/**
 	 * 手机验证码
 	 */
-	//@NotBlank(message = "手机验证码不能为空")
+	@NotBlank(message = "手机验证码不能为空")
 	@Length(max=6,message = "手机验证码不能超过6位")
 	private String mobileCode;
 

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.120</version>
+    <version>0.3.121</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>