Browse Source

fix bug:
1.赋值集团编码错误提示的result提示错误的问题
2.当请求参数既没有zoneType也没有zoneTypeList时报空指针问题

lijie 3 years ago
parent
commit
4c44f15c10

+ 1 - 1
src/main/java/com/persagy/proxy/common/service/impl/EmsAuthServiceImpl.java

@@ -51,7 +51,7 @@ public class EmsAuthServiceImpl extends AbstractAuthServiceImpl {
         }
         List<Group> content = queryResult.getContent();
         if (CollUtil.isEmpty(content)){
-            throw new BusinessException(ResponseCode.A0402.getDesc(), ResponseCode.A0402.getDesc());
+            throw new BusinessException(ResponseCode.A0402.getCode(), ResponseCode.A0402.getDesc());
         }
         Map<String, List<Project>> groupMap = content.stream()
                 .collect(Collectors.toMap(Group::getGroupCode, Group::getProjects, (k1, k2) -> k1));

+ 1 - 1
src/main/java/com/persagy/proxy/object/service/impl/AdmSpaceServiceImpl.java

@@ -142,7 +142,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
         String classCodeFilter = "";
         if(StrUtil.isNotEmpty(request.getZoneType())){
             classCodeFilter = " classCode = '"+request.getZoneType()+"'";
-        }else{
+        }else if (CollUtil.isNotEmpty(request.getZoneTypeList())){
             classCodeFilter = " classCode in ['"+ String.join("', '",request.getZoneTypeList()) + "']";
         }
         String filters = request.getFilters();