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

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

@@ -970,10 +970,10 @@ public class UserFacade extends UserServiceImpl {
      * @param autStatus
      * @return
      */
-    public RespDTO<IPage<UserAllDTO>> queryUserInformations(Page page, String orgName, Integer autStatus,String startTime,String endTime){
+    public RespDTO<IPage<UserAllDTO>> queryUserInformations(Page page, String userName, Integer autStatus,String startTime,String endTime){
     	CustomerDTO userInfo = new CustomerDTO();
-    	if(orgName != null && orgName.length() != 0){
-    		userInfo.setOrgName(orgName);
+    	if(userName != null && userName.length() != 0){
+    		userInfo.setUserName(userName);
     	}
         if(!autStatus.equals("")){
             userInfo.setAutStatus(autStatus);

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

@@ -12,6 +12,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class UserInfoPagVO extends Page {
+	String userName;
     String orgName;
     Integer autStatus;
 	String startTime;//开始时间

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

@@ -148,7 +148,7 @@ public class UserInfoController {
     @SysLogger("queryUserInformation")
     public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO){
     	
-    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getOrgName(), userInfoPagVO.getAutStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
+    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getUserName(), userInfoPagVO.getAutStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
     }