Explorar o código

公出汇总新增总裁助力审核

anderx %!s(int64=4) %!d(string=hai) anos
pai
achega
32befc4986

+ 2 - 2
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -21,8 +21,8 @@ public class AFTConstants {
 	public static final String	APPROVAL_DECISION_AUDITOR			= "99989";
 	/**	总裁 */
 	public static final String	CED									= "99998";
-	/**	总裁审核 */
-	public static final String	CED_AUDITOR							= "99988";
+	/**	总裁助力 */
+	public static final String	CED_ASSISTANT						= "99988";
 	/**	集团副总 */
 	public static final String	VICE_CEO							= "99997";				
 	/** 技术管理员 */

+ 2 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -329,7 +329,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getUid()!=null)map.put("uid", in.getUid());
 		if(in.getStatus()!=null)map.put("status", in.getStatus());
 		if(in.getClockIn()!=null)map.put("clockIn", in.getClockIn());
-		if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){in.setType(2);}
+		if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
+				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){in.setType(2);}
 		else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)){
 			in.setType(1);
 			map.put("deps", orderService.selectMyDeps());