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

user-service/src/main/java/com/diagbot/entity/UserInfo.java

@@ -0,0 +1,158 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 用户信息类表
+ * @date 2018年9月17日 下午4:35:35
+ */
+@TableName("sys_user and sys_user_organization")
+public class UserInfo implements Serializable{
+	
+	 private static final long serialVersionUID = 1L;
+	 
+	 /**
+	     * 用户ID
+	     */
+	    @TableId(value = "id", type = IdType.AUTO)
+	    private Long userId;
+
+	    /**
+	     * 记录创建时间
+	     */
+	    private Date userGmtCreate;
+	   
+	    /**
+	     * 用户名
+	     */
+	    private String userName;
+
+	    /**
+	     * 联系人
+	     */
+	    private String linKman;
+
+	    /**
+	     * 邮箱
+	     */
+	    private String email;
+	    /**
+	     * 机构ID
+	     */
+	    @TableId(value = "id", type = IdType.AUTO)
+	    private Long orgId;
+
+	    /**
+	     * 记录创建时间
+	     */
+	    private Date orgGmtCreate;
+
+
+	    /**
+	     * 机构名称
+	     */
+	    private String orgName;
+
+
+		public Long getUserId() {
+			return userId;
+		}
+
+
+		public void setUserId(Long userId) {
+			this.userId = userId;
+		}
+
+
+		public Date getUserGmtCreate() {
+			return userGmtCreate;
+		}
+
+
+		public void setUserGmtCreate(Date userGmtCreate) {
+			this.userGmtCreate = userGmtCreate;
+		}
+
+
+		public String getUserName() {
+			return userName;
+		}
+
+
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+
+
+		public String getLinKman() {
+			return linKman;
+		}
+
+
+		public void setLinKman(String linKman) {
+			this.linKman = linKman;
+		}
+
+
+		public String getEmail() {
+			return email;
+		}
+
+
+		public void setEmail(String email) {
+			this.email = email;
+		}
+
+
+		public Long getOrgId() {
+			return orgId;
+		}
+
+
+		public void setOrgId(Long orgId) {
+			this.orgId = orgId;
+		}
+
+
+		public Date getOrgGmtCreate() {
+			return orgGmtCreate;
+		}
+
+
+		public void setOrgGmtCreate(Date orgGmtCreate) {
+			this.orgGmtCreate = orgGmtCreate;
+		}
+
+
+		public String getOrgName() {
+			return orgName;
+		}
+
+
+		public void setOrgName(String orgName) {
+			this.orgName = orgName;
+		}
+
+
+		public static long getSerialversionuid() {
+			return serialVersionUID;
+		}
+
+
+		@Override
+		public String toString() {
+			return "UserInfo [userId=" + userId + ", userGmtCreate=" + userGmtCreate + ", userName=" + userName
+					+ ", linKman=" + linKman + ", email=" + email + ", orgId=" + orgId + ", orgGmtCreate="
+					+ orgGmtCreate + ", orgName=" + orgName + "]";
+		}
+	    
+	    
+
+}

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserInfo;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,5 +25,5 @@ public interface UserMapper extends BaseMapper<User> {
 
     IPage<User> selectUserListPage(Page page, @Param("user") User user);
     
-    IPage<User> selectUserInfoListPage(Page page);
+    IPage<UserInfo> selectUserInfoListPage(Page page);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserInfo;
+
 import javafx.scene.control.Pagination;
 
 import java.util.List;
@@ -23,5 +25,5 @@ public interface UserService extends IService<User> {
 
     IPage<User> selectUserListPage(Page<User> page, User user);
     
-    public IPage<User>  selectUserInfoListPage(Page<User> page);
+    public IPage<UserInfo>  selectUserInfoListPage(Page<UserInfo> page);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserInfo;
 import com.diagbot.mapper.UserMapper;
 import com.diagbot.service.UserService;
 import org.springframework.stereotype.Service;
@@ -31,7 +32,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return baseMapper.selectUserListPage(page, user);
     }
     @Override
-    public IPage<User>  selectUserInfoListPage(Page<User> page){
+    public IPage<UserInfo>  selectUserInfoListPage(Page<UserInfo> page){
     	return baseMapper.selectUserInfoListPage(page);
     	
     }

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserInfo;
 import com.diagbot.facade.UserFacade;
 
 import io.swagger.annotations.ApiOperation;
@@ -32,7 +33,7 @@ public class UserInfoController {
 	    @SysLogger("getUserInfoPag")
 //	    @ApiIgnore
 	    public RespDTO getUserInfoPag(Page page){
-	        IPage<User> user=  userFacade.selectUserInfoListPage(page);
+	        IPage<UserInfo> user=  userFacade.selectUserInfoListPage(page);
 	        return RespDTO.onSuc(user);
 	    }
 	

user-service/src/main/resources/mapper/UserMapper.xml

@@ -33,13 +33,28 @@
         </if>
     </select>
 
-	<select id="selectUserInfoListPage" resultMap="BaseResultMap">
+<!-- 	<select id="selectUserInfoListPage" resultMap="BaseResultMap">
 		select u.*
 		LEFT JOIN sys_user_role ur on u.id= ur.user_id
 		LEFT JOIN
 		sys_role r on ur.role_id=r.id
 		where u.is_deleted = 'N' and type = "0"
 		ORDER BY gmt_create DESC
+	</select> -->
+	
+    <select id="selectUserInfoListPage"  resultType="com.diagbot.entity.UserInfo">
+		SELECT
+		u.id AS userId,
+		u.gmt_create as userGmtCreate,
+		u.username as userName,
+		u.linkman as linKman,
+		u.email as email,
+		org.id AS orgId,
+		org.gmt_create as orgGmtCreate,
+		org.name as orgName
+		FROM sys_user u
+		LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+		LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+		WHERE u.is_deleted = 'N' AND u.TYPE = "0" ORDER BY u.gmt_create DESC
 	</select>
-
 </mapper>