Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -700,7 +700,7 @@ public class UserFacade extends UserServiceImpl {
      * @param autStatus
      * @return 分页查询用户信息和机构信息开通产品
      */
-    public RespDTO<UserInfoDTO> getUserOrganProductAlls(Page page, String orgName, Integer autStatus){
+    public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAlls(Page page, String orgName, Integer autStatus){
     	
     	 UserInfoDTO userInfo = new UserInfoDTO();
          userInfo.setOrgName(orgName);

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -37,7 +37,7 @@ public interface UserService extends IService<User> {
      */
     IPage<User> selectUserListPage(Page<User> page, User user);
 
-    public IPage<UserInfoDTO> selectUserInfoListPage(Page<UserInfoDTO> page, UserInfoDTO userInfo);
+    public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo);
 
     public boolean updateUserInfoAll(Map<String, Object> userMap);
 

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -52,7 +52,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public IPage<UserInfoDTO> selectUserInfoListPage(Page<UserInfoDTO> page, UserInfoDTO userInfo) {
+    public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo) {
         return baseMapper.selectUserInfoListPage(page, userInfo);
 
     }

user-service/src/main/java/com/diagbot/vo/UserInfoPagVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2018/9/28 13:39
+ */
+@Getter
+@Setter
+public class UserInfoPagVO extends Page {
+    String orgName;
+    Integer autStatus;
+}

user-service/src/main/java/com/diagbot/vo/UserOrganProductPageVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2018/9/28 13:48
+ */
+@Getter
+@Setter
+public class UserOrganProductPageVO extends Page {
+    String orgName;
+    Integer autStatus;
+}

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

@@ -4,6 +4,8 @@ import java.util.List;
 
 import javax.validation.Valid;
 
+import com.diagbot.vo.UserInfoPagVO;
+import com.diagbot.vo.UserOrganProductPageVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,11 +56,11 @@ public class UserInfoController {
     @PostMapping("/getUserInfoPag")
     @SysLogger("getUserInfoPag")
     // @ApiIgnore
-    public RespDTO<UserInfoDTO> getUserInfoPag(Page page, String orgName, Integer autStatus) {
+    public RespDTO<UserInfoDTO> getUserInfoPag(@RequestBody UserInfoPagVO userInfoPagVO) {
         UserInfoDTO userInfo = new UserInfoDTO();
-        userInfo.setOrgName(orgName);
-        userInfo.setAutStatus(autStatus);
-        IPage<UserInfoDTO> user = userFacade.selectUserInfoListPage(page, userInfo);
+        userInfo.setOrgName(userInfoPagVO.getOrgName());
+        userInfo.setAutStatus(userInfoPagVO.getAutStatus());
+        IPage<UserInfoDTO> user = userFacade.selectUserInfoListPage(userInfoPagVO, userInfo);
         return RespDTO.onSuc(user);
     }
 
@@ -114,12 +116,13 @@ public class UserInfoController {
 
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
+
     @ApiOperation(value = "用户信息和机构信息已开通产品[by:wangfeng]", notes = "用户信息和机构信息已开通产品")
     @PostMapping("/getUserOrganProductAll")
     @SysLogger("getUserOrganProductAll")
     @Transactional
-    public RespDTO<UserInfoDTO> getUserOrganProductAll(Page page, String orgName, Integer autStatus) {
-       
-        return userFacade.getUserOrganProductAlls(page,orgName,autStatus);
+    public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAll(@RequestBody UserOrganProductPageVO pageVO) {
+
+        return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAutStatus());
     }
 }