소스 검색

催款权限调整

anderx 4 년 전
부모
커밋
9e9cd2d224
2개의 변경된 파일11개의 추가작업 그리고 11개의 파일을 삭제
  1. 6 6
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  2. 5 5
      src/main/resources/props/config_local.properties

+ 6 - 6
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -777,9 +777,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (specially==null)specially=0;
 		params.put("specially", specially);
 		Integer i=null;
-		if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
-			params.put("aid", TokenManager.getAdminId());
-		} else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+		if (TokenManager.hasRole(AFTConstants.FINANCE)) {
 			i=1;
 			params.put("fid", TokenManager.getAdminId());
 		}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
@@ -789,6 +787,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||
 				TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
 			i=3;
+		}else {
+				params.put("aid", TokenManager.getAdminId());
 		}
 		if (specially==1){
 			params.put("aid", aid);
@@ -1370,14 +1370,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(in.gettStarTime())) params.put("tStarTime", in.gettStarTime());
 		if (StringUtils.isNotBlank(in.gettEndTime())) params.put("tEndTime", in.gettEndTime()+" 23:59:59");
 		Integer i=null;
-		if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
-			params.put("aid", TokenManager.getAdminId());
-		} else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+		 if (TokenManager.hasRole(AFTConstants.FINANCE)) {
 			i=1;
 			params.put("fid", TokenManager.getAdminId());
 		}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
 			i=2;
 			params.put("fid", TokenManager.getAdminId());
+		}else{
+			 params.put("aid", TokenManager.getAdminId());
 		}
 		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
 				TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||

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

@@ -1,11 +1,11 @@
 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.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/aft?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