用户机构开通信息接口

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -696,34 +696,34 @@ public class UserFacade extends UserServiceImpl {
          List<UserAndProdutUDTO> dataList = InformationData.data;
          
         System.out.println("===================="+GsonUtil.toJson(dataList));
-        
-        
-/*        for(int i =0;i<dataList.size();i++ ){
-        	UserAndProdutUDTO  userAndProdutData = dataList.get(i);
-        	Long userprodutId = userAndProdutData.getUserId();
-        	for(int j =0;j<userData.size();i++){
-        		UserInfoDTO userInfoDate = userData.get(j);
-        		Long userInfoId = userInfoDate.getUserId();
+        List<UserOrganProductDTO> userOrganProductList = new ArrayList<UserOrganProductDTO>();
+        for(int i =0;i<userData.size();i++){
+        	UserInfoDTO userInfoDate = userData.get(i);
+    		Long userInfoId = userInfoDate.getUserId();
+    		UserOrganProductDTO userOrgan=new UserOrganProductDTO();
+			userOrgan.setUserId(userInfoId);
+			userOrgan.setUserGmtCreate(userInfoDate.getUserGmtCreate());
+			userOrgan.setUserName(userInfoDate.getUserName());
+			userOrgan.setLinKman(userInfoDate.getLinKman());
+			userOrgan.setEmail(userInfoDate.getEmail());
+			userOrgan.setOrgId(userInfoDate.getOrgId());
+			userOrgan.setOrgGmtCreate(userInfoDate.getOrgGmtCreate());
+			userOrgan.setOrgName(userInfoDate.getOrgName());
+			userOrgan.setOrgType(userInfoDate.getOrgType());
+			userOrgan.setOrgTypeStr(userInfoDate.getOrgTypeStr());
+			userOrgan.setOrgPrincipal(userInfoDate.getOrgPrincipal());
+			userOrgan.setOrgAddress(userInfoDate.getOrgAddress());
+			userOrgan.setOrgParentId(userInfoDate.getOrgParentId());
+			userOrgan.setOrgSubNum(userInfoDate.getOrgSubNum());
+			userOrgan.setAutPosition(userInfoDate.getAutPosition());
+			userOrgan.setAutIsReject(userInfoDate.getAutIsReject());
+			userOrgan.setAutStatus(userInfoDate.getAutStatus());
+			userOrgan.setAutStatusStr(userInfoDate.getAutStatusStr());
+			List<UserAndProdutUDTO>  userProdList = new ArrayList<UserAndProdutUDTO>();
+        	 for(int j =0;j<dataList.size();j++ ){
+        	    UserAndProdutUDTO  userAndProdutData = dataList.get(i);
+             	Long userprodutId = userAndProdutData.getUserId();
         		if(userprodutId==userInfoId){
-        			UserOrganProductDTO userOrgan=new UserOrganProductDTO();
-        			userOrgan.setUserId(userInfoId);
-        			userOrgan.setUserGmtCreate(userInfoDate.getUserGmtCreate());
-        			userOrgan.setUserName(userInfoDate.getUserName());
-        			userOrgan.setLinKman(userInfoDate.getLinKman());
-        			userOrgan.setEmail(userInfoDate.getEmail());
-        			userOrgan.setOrgId(userInfoDate.getOrgId());
-        			userOrgan.setOrgGmtCreate(userInfoDate.getOrgGmtCreate());
-        			userOrgan.setOrgName(userInfoDate.getOrgName());
-        			userOrgan.setOrgType(userInfoDate.getOrgType());
-        			userOrgan.setOrgTypeStr(userInfoDate.getOrgTypeStr());
-        			userOrgan.setOrgPrincipal(userInfoDate.getOrgPrincipal());
-        			userOrgan.setOrgAddress(userInfoDate.getOrgAddress());
-        			userOrgan.setOrgParentId(userInfoDate.getOrgParentId());
-        			userOrgan.setOrgSubNum(userInfoDate.getOrgSubNum());
-        			userOrgan.setAutPosition(userInfoDate.getAutPosition());
-        			userOrgan.setAutIsReject(userInfoDate.getAutIsReject());
-        			userOrgan.setAutStatus(userInfoDate.getAutStatus());
-        			userOrgan.setAutStatusStr(userInfoDate.getAutStatusStr());
         			UserAndProdutUDTO produData = new UserAndProdutUDTO();
         			produData.setId(userAndProdutData.getId());
         			produData.setProductId(userAndProdutData.getProductId());
@@ -734,15 +734,15 @@ public class UserFacade extends UserServiceImpl {
         			produData.setAccessType(userAndProdutData.getAccessType());
         			produData.setChargeType(userAndProdutData.getChargeType());
         			produData.setProductName(userAndProdutData.getProductName());
-        			userOrgan.setUserAndProdutDTO(produData);
-        			
-        		}
-        		
-        	}
+        			userProdList.add(produData);
+        		} 
+             	
+        	 }
+        	 userOrgan.setUserAndProdutUDTO(userProdList);
+        	 
+        	 userOrganProductList.add(userOrgan);
         	
-        }*/
-       
-         
-    	return null;
+        }
+    	return RespDTO.onSuc(userOrganProductList);
     }
 }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -123,7 +123,7 @@ public class UserInfoController {
 
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
-    @ApiOperation(value = "用户信息和机构信息开通产品[by:wangfeng]", notes = "用户信息和机构信息的绑定")
+    @ApiOperation(value = "用户信息和机构信息开通产品[by:wangfeng]", notes = "用户信息和机构信息开通产品")
     @PostMapping("/addUserInfo")
     @SysLogger("addUserInfo")
     @Transactional