Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -234,7 +234,6 @@ public class SysUser extends BaseEntity {
 
     @TableField(exist = false)
     private Long[] roleIds;
-
     @TableField(exist = false)
     private List<SysRole> roles;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -85,7 +85,7 @@ public class SysDeptController extends BaseController {
         }
         dept.setCreateBy(SecurityUtils.getUsername());
         dept.setCreateTime(new Date());
-
+        dept.setSource(0);
         return toAjax(orgService.saveOrUpdateOrg(dept));
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -195,6 +195,7 @@ public class SysUserController extends BaseController {
             ajax.put("roleName", roleService.getRoleName(userId));
             ajax.put("sex", sex);
             ajax.put("status", status);
+            ajax.put("source", sysUser.getSource());
         }
         return ajax;
     }
@@ -213,6 +214,7 @@ public class SysUserController extends BaseController {
             return error("新增用户'" + user.getUsername() + "'失败，手机号码已存在");
         }
         user.setCreateBy(SecurityUtils.getUsername());
+        user.setSource(3);
         user.setCreateTime(new Date());
         //isp的加密方式
         final String salt = SaltHelper.salt();

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.util.CollectionUtils;
 import javax.validation.Validator;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -105,7 +106,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         //获取数据
         page = userMapper.getPage(page,user);
-
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -4,27 +4,45 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.system.mapper.SysUserMapper">
     <resultMap type="com.xunmei.system.api.domain.SysUser" id="SysUserResult">
-        <id property="id" column="id"/>
+        <result property="id" column="id"/>
         <result property="deptId" column="dept_id"/>
-        <result property="username" column="user_name"/>
-        <result property="nickName" column="nick_name"/>
-        <result property="email" column="email"/>
-        <result property="phonenumber" column="phonenumber"/>
-        <result property="sex" column="sex"/>
-        <result property="avatar" column="avatar"/>
+        <result property="isManager" column="is_manager"/>
+        <result property="isLock" column="is_lock"/>
+        <result property="jobId" column="job_id"/>
+        <result property="name" column="name"/>
+        <result property="username" column="username"/>
+        <result property="orgId" column="org_id"/>
+        <result property="phone" column="phone"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifiedName" column="modified_name"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="modifiedId" column="modified_id"/>
         <result property="password" column="password"/>
-        <result property="status" column="status"/>
+        <result property="salt" column="salt"/>
         <result property="deleted" column="deleted"/>
-        <result property="loginIp" column="login_ip"/>
-        <result property="loginDate" column="login_date"/>
+        <result property="lastIp" column="last_ip"/>
+        <result property="lastTime" column="last_time"/>
+        <result property="orgName" column="org_name"/>
+        <result property="orgPath" column="org_path"/>
+        <result property="image" column="image"/>
+        <result property="card" column="card"/>
+        <result property="gender" column="gender"/>
+        <result property="jobNumber" column="job_number"/>
+        <result property="note" column="note"/>
+        <result property="isSign" column="is_sign"/>
+        <result property="signTime" column="sign_time"/>
+        <result property="agreementId" column="agreement_id"/>
+        <result property="signVersion" column="sign_version"/>
+        <result property="approveStatus" column="approve_status"/>
+        <result property="locked" column="locked"/>
         <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-
-        <association property="dept" column="dept_id" javaType="com.xunmei.system.api.domain.SysDept"
-                     resultMap="deptResult"/>
-        <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
+        <result property="code" column="code"/>
+        <result property="source" column="source"/>
+        <result property="originalOrgId" column="original_org_id"/>
+        <collection property="roles" ofType="com.xunmei.system.api.domain.SysRole">
+            <result column="role_name" property="roleName"/>
+        </collection>
     </resultMap>
 
     <!--	<resultMap type="com.xunmei.system.api.domain.SysUser" id="SyncSysUserResult">-->
@@ -390,9 +408,10 @@
         where u.id = #{userId}
     </select>
 
-    <select id="getPage" resultType="com.xunmei.system.api.domain.SysUser">
+    <select id="getPage" resultMap="SysUserResult">
         SELECT
         h.user_id AS is_manager,
+        sr.role_name,
         u.id,
         u.dept_id,
         u.is_lock,
@@ -432,6 +451,8 @@
         sys_user u
         LEFT JOIN sys_org o ON u.original_org_id = o.id
         LEFT JOIN ( SELECT user_id FROM sys_user_role uo LEFT JOIN sys_role ro ON uo.role_id = ro.id WHERE ro.role_name LIKE '%安全保卫管理人员' ) h ON h.user_id = u.id
+        LEFT JOIN sys_user_role sro on u.id=sro.user_id
+        LEFT JOIN sys_role sr on sro.role_id=sr.id
         where 1=1
         <choose>
             <when test="info.checkSub">