Browse Source

新增公共客户转为渠道

anderx 3 years ago
parent
commit
6d38dba149

+ 0 - 3
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -142,9 +142,6 @@ public class AdminCustomerApiController extends BaseApiController{
 		Result res = new Result();
 		in.setNewChannel(1);
 		in.setShareType(0);
-		if (StringUtils.isBlank(in.getAid())){
-			in.setAid(TokenManager.getAdminId());
-		}
 		res.setData(customerService.channelUserList(in));
 		return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2466,6 +2466,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	private void addParams(InputChannelListBo in, Map<String, Object> params) {
 		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
 			if (null!= in.getAid()) params.put("aid", in.getAid());
+		}else if (TokenManager.hasRole(AFTConstants.SALESMAN)){
+			params.put("aid", TokenManager.getAdminId());
 		}
 		if (StringUtils.isNotBlank(in.getName())) params.put("name", in.getName());
 		if (StringUtils.isNotBlank(in.getStartDate())) params.put("startDate", in.getStartDate());

+ 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/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.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