Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx 1 год назад
Родитель
Сommit
ccbe7f7d49

+ 2 - 1
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -277,7 +277,8 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
         int i = userMapper.checkUserMax(TokenManager.getAdminId());
         int i = userMapper.checkUserMax(TokenManager.getAdminId());
         int limitMax=101;
         int limitMax=101;
         //加入限定项目的数量
         //加入限定项目的数量
-        int rpCount =restrictProjectMapper.selectPrivateByAid(TokenManager.getAdminId());
+        Integer rpCount =restrictProjectMapper.selectPrivateByAid(TokenManager.getAdminId());
+        rpCount=rpCount==null?0:rpCount;
         i=i+rpCount;
         i=i+rpCount;
         User user = userMapper.selectByPrimaryKey(uid);
         User user = userMapper.selectByPrimaryKey(uid);
         if (user.getShareType()==0||user.getShareType()==2){
         if (user.getShareType()==0||user.getShareType()==2){

+ 1 - 1
src/main/java/com/goafanti/common/dao/RestrictProjectMapper.java

@@ -47,5 +47,5 @@ public interface RestrictProjectMapper {
 
 
     void deleteByPram(RestrictProject restrictProject);
     void deleteByPram(RestrictProject restrictProject);
 
 
-    int selectPrivateByAid(String aid);
+    Integer selectPrivateByAid(String aid);
 }
 }

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

@@ -2564,7 +2564,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		int limitmax = 1;
 		int limitmax = 1;
 		int i = userMapper.checkUserMax(aid);
 		int i = userMapper.checkUserMax(aid);
 		//加入限定项目的数量
 		//加入限定项目的数量
-		int rpCount =restrictProjectMapper.selectPrivateByAid(TokenManager.getAdminId());
+		Integer rpCount =restrictProjectMapper.selectPrivateByAid(TokenManager.getAdminId());
+		rpCount=rpCount==null?0:rpCount;
 		i=i+rpCount;
 		i=i+rpCount;
 		if (uid !=null){
 		if (uid !=null){
 			User user =userMapper.selectByPrimaryKey(uid);
 			User user =userMapper.selectByPrimaryKey(uid);