anderx 3 years ago
parent
commit
6d1e1e636d

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

@@ -11,7 +11,7 @@ public class AFTConstants {
 
 	public static final String	MMDD								= "MM-dd";
 	/** 初始密码*/
-	public static final String	INITIALPASSWORD						= "123456";				
+	public static final String	INITIALPASSWORD						= "123456";
 
 	/**	超级管理员 */
 	public static final String	SUPERADMIN							= "999999";
@@ -24,48 +24,50 @@ public class AFTConstants {
 	/**	总裁助力 */
 	public static final String	CED_ASSISTANT						= "99988";
 	/**	集团副总 */
-	public static final String	VICE_CEO							= "99997";				
+	public static final String	VICE_CEO							= "99997";
 	/** 技术管理员 */
-	public static final String  TECH_ADMIN                          = "9998";				
+	public static final String  TECH_ADMIN                          = "9998";
 	/**	技术经理 */
-	public static final String  TECH_MANAGER                        = "998";				
+	public static final String  TECH_MANAGER                        = "998";
 	/**	技术员 */
-	public static final String  TECH		                        = "98";					
+	public static final String  TECH		                        = "98";
 	/**	财务管理员*/
-	public static final String  FINANCE_ADMIN                       = "9997";				
+	public static final String  FINANCE_ADMIN                       = "9997";
 	/**	财务经理*/
-	public static final String  FINANCE_MANAGER						= "997";				
+	public static final String  FINANCE_MANAGER						= "997";
 	/**	财务专员*/
-	public static final String  FINANCE								= "97";					
+	public static final String  FINANCE								= "97";
 	/**	营销管理员 */
-	public static final String  SALESMAN_ADMIN                      = "9996";				
+	public static final String  SALESMAN_ADMIN                      = "9996";
 	/**	营销总监 */
-	public static final String  SALESMAN_DIRECTOR                   = "9995";				
+	public static final String  SALESMAN_DIRECTOR                   = "9995";
 	/** 营销经理 */
-	public static final String  SALESMAN_MANAGER                    = "996";				
+	public static final String  SALESMAN_MANAGER                    = "996";
 	/**	营销员 */
-	public static final String  SALESMAN                      		= "96";					
+	public static final String  SALESMAN                      		= "96";
 	/**	外包审核员 */
 	public static final String  OUTSOURCE_AUDITOR                   = "9991";
+	/** 人事管理员*/
+	public static final String  PERSONNEL_AUDITOR                 = "9991";
 	/** 专利管理员 */
 	public static final String  PATENT_AUDITOR 	                  	= "9992";
 	/** 公司管理 */
 	public static final String  COMPANY_MANAGER 	                = "9993";
 	/** 渠道专员 */
-	public static final String  CHANNEL                      		= "80";		
+	public static final String  CHANNEL                      		= "80";
 	/** 渠道总监 */
-	public static final String  CHANNEL_DIRECTOR                    = "9980";		
+	public static final String  CHANNEL_DIRECTOR                    = "9980";
 	/** 客服专员 */
 	public static final String  CUSTOMER_SERVICE            		= "81";
 	/** 法务专员 */
 	public static final String  LEGAL_OFFICER		          		= "82";
 	/** 地区管理员*/
-	public static final String	AREAADMIN							= "";					
+	public static final String	AREAADMIN							= "";
 	/** 审核员*/
-	public static final String	AUDITORADMIN						= "";					
+	public static final String	AUDITORADMIN						= "";
 	/** 客户经理*/
-	public static final String	MANAGERADMIN						= "";					
-	
+	public static final String	MANAGERADMIN						= "";
+
 	/** 渠道客户敏感限制*/
 	public static final String  CHANNEL_SENSITIVE="投资,贸易,贷款 ,房地产,金融,基金,商务,酒店,商业,工贸,物业,保险,销售,服务,装卸,管理,"
 			+ "置业,百货,资产,商贸,租赁,加工,合伙企业,财务有限公司,代理,经营,工贸,旅游,观光,资本,劳务,"
@@ -80,9 +82,9 @@ public class AFTConstants {
 	public static final String	COPYRIGHT							= "软著申请管理";
 
 	public static final String	TECHPROJECT							= "科技项目申报管理";
-	
+
 	public static final String	DEFAULT_INITIATOR					= "超级管理员";
-	
+
 	public static final String	CONSULTANT_MANAGER					= "咨询师管理员";
 
 	public static final int		KEYWORDLENTH						= 16;
@@ -144,9 +146,9 @@ public class AFTConstants {
 	public static final Integer	USER_TRANSFER_TO_OTHER				= 3;
 	/** 签单转交*/
 	public static final Integer	SIGN_USER_TRANSFER_TO_OTHER				= 4;
-	
-	
-	
+
+
+
 	public static final String	PROJECT_TRANSFER_TO_OTHER				= "转交客户给制定人";
 
 	/**组织类型-公司*/
@@ -166,24 +168,24 @@ public class AFTConstants {
 	public static final long USER_FOLLOW_LIMIT_MS					= 24*3600*1000*30L;
 	/** 转公公共客户签单时限 **/
 	public static final long USER_SIGN_LIMIT_MS						= 24*3600*1000*270L;
-	
+
 	/** 转公共客户拜访时限 **/
 	public static final long PROJECT_FOLLOW_LIMIT_MS					= 24*3600*1000*360L;
 	/** 转公公共客户签单时限 **/
 	public static final long PROJECT_SIGN_LIMIT_MS						= 24*3600*1000*900L;
-	
+
 	public static final long USER_CHENNL_LIMIT_MS						= 24*3600*1000*90L;
-	
+
 	public static final Integer USER_STATUS = 1;
 	/** 领取员工上线 **/
 	public static final Integer USER_RCEIVE_MAX= 9;
-	
+
 	public static final String ADMIN_EMAIL= "anderx@dingtalk.com";
-	
-	
+
+
 	public static final String DEFAULT_CONTACT_TYPE="0";
-	
+
 	public static final String DEFAULT_RESULT="签单-自动触发";
 
     public static final long DUN_START_LIMIT_MS						= 24*3600*1000*900L;
-}
+}

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

@@ -358,7 +358,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
 		if(in.getPublicType()!=null)map.put("publicType",in.getPublicType());
 		if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
-				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
+				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT )||TokenManager.hasRole(AFTConstants.PERSONNEL_AUDITOR)){
 			in.setType(2);}
 		else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)){
 			in.setType(1);

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20