Merge branch 'mazq-dataauthmodify-0413' into 'develop'

服务无法启动修改

See merge request dcuc-tjdsj/auth-service!9

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/facade/DataAuthFacade.java

@@ -22,8 +22,8 @@ public class DataAuthFacade implements IDataAuthFacade{
     @Autowired
     private IDataAuthService dataAuthService;
 
-    @Autowired
-    private IDataAuthBusiness dataAuthBusiness;
+//    @Autowired
+//    private IDataAuthBusiness dataAuthBusiness;
 
     @Override
     public DataAuthDTO dataAuthAdd(DataAuthDTO dataAuthDTO) {

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/DataAuthServiceImpl.java

@@ -150,8 +150,8 @@ public class DataAuthServiceImpl implements IDataAuthService {
     @Override
     public SubDataAuthDTO getSubDataAuth(String subId, String subType,String authType) {
         List<DataAuth> dataAuths = getDataAuthsBySub(subId, subType,authType);
-        SubDataAuthDTO subDataAuthDTO = new SubDataAuthDTO(subId,subType);
         List<SubDataDTO> subDataList = new ArrayList<>();
+        SubDataAuthDTO subDataAuthDTO = new SubDataAuthDTO(subId,subType);
         Map<String, List<DataAuth>> map = dataAuths.stream().collect(Collectors.groupingBy(DataAuth::getDataType));
         for (Map.Entry<String, List<DataAuth>> entry : map.entrySet()) {
             String dataType = entry.getKey();