Merge branch 'system-zyj' into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -92,6 +92,10 @@ public class SysUserController extends BaseController
         }
 //        user.setUserType("00");
 //        user.setTenantId(SecurityUtils.getTenantId());
+        if(user.getUserType().equals("00")){
+            user.setDeptId(deptService.deptListByTenant(user.getTenantId()).get(0).getDeptId());
+        }
+
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         int row = userService.insertPlatAccount(user);
@@ -110,16 +114,6 @@ public class SysUserController extends BaseController
         return toAjax(userService.updatePlatAccount(user));
     }
 
-    /**
-     * 删除运维管理系统-平台账号
-     */
-    @Log(title = "删除运维管理系统-平台账号", businessType = BusinessType.DELETE)
-    @DeleteMapping("/delPlatAccount/{userId}")
-    public ApiResult<Void> remove(@PathVariable Long userId)
-    {
-        return toAjax(userService.deletePlatAccountById(userId));
-    }
-
     /**
      * 获取用户列表
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -24,8 +24,6 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
-    List<SysUser> platAccountlist(SysUser sysUser);
-
     /**
      * 根据条件分页查询未已配用户角色列表
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -25,7 +25,6 @@ public interface ISysUserService extends CrudService<SysUser> {
 
 
     List<SysUser> platAccountlist(SysUser user);
-    int insertPlatAccount(SysUser user);
 
     /**
      * 根据条件分页查询用户列表
@@ -152,7 +151,13 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public int insertUser(SysUser user);
 
-
+    /**
+     * 新增平台账号信息
+     *
+     * @param user 平台账号信息
+     * @return 结果
+     */
+    public int insertPlatAccount(SysUser user);
 
     /**
      * 注册用户信息
@@ -237,14 +242,6 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public int deleteUserById(Long userId);
 
-    /**
-     * 删除运维管理系统-平台账号信息
-     *
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deletePlatAccountById(Long userId);
-
     /**
      * 批量删除用户信息
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -81,13 +81,13 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
     @Override
     public List<SysUser> platAccountlist(SysUser user) {
 
-        return userMapper.platAccountlist(user);
+        return userMapper.selectUserList(user);
     }
 
     /**
-     * 新增运维管理系统-平台账号信息
+     * 新增保存平台账户信息
      *
-     * @param user 用户信息
+     * @param user 平台账户信息
      * @return 结果
      */
     @Override
@@ -95,6 +95,15 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
     public int insertPlatAccount(SysUser user) {
         // 新增用户信息
         int rows = userMapper.insertUser(user);
+        SysUserTenant sysUserTenant = new SysUserTenant();
+        sysUserTenant.setUserId(user.getUserId());
+        sysUserTenant.setIsDefault(false);
+        sysUserTenant.setTenantId(user.getTenantId());
+        sysUserTenantService.save(sysUserTenant);
+        // 新增用户岗位关联
+        insertUserPost(user);
+        // 新增用户与角色管理
+        insertUserRole(user);
         return rows;
     }
 
@@ -545,18 +554,6 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.deleteUserById(userId);
     }
 
-    /**
-     * 删除运维管理系统-平台账号信息
-     *
-     * @param userId 用户ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int deletePlatAccountById(Long userId) {
-        return userMapper.deleteUserById(userId);
-    }
-
     /**
      * 批量删除用户信息
      *

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -96,43 +96,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		ORDER BY u.user_id DESC
 	</select>
-
-	<select id="platAccountlist" parameterType="com.usky.system.domain.SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.email, u.phonenumber, u.sex, u.full_name, u.avatar, u.password,
-		u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
-		from sys_user u
-		where u.del_flag = '0'
-		<if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
-		</if>
-		<if test="createBy != null and createBy != ''">
-			AND u.create_by = #{createBy}
-		</if>
-		<if test="status != null and status != ''">
-			AND u.status = #{status}
-		</if>
-		<if test="tenantId != null and tenantId != '' and tenantId !=0">
-			AND u.tenant_id = #{tenantId}
-		</if>
-		<if test="userType != null and userType != ''">
-			AND u.user_type = #{userType}
-		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
-		</if>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(u.create_time,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{params.beginTime},'%Y-%m-%d %H:%i:%s')
-		</if>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(u.create_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{params.endTime},'%Y-%m-%d %H:%i:%s')
-		</if>
-		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-		ORDER BY u.user_id DESC
-	</select>
 	
 	<select id="selectAllocatedList" parameterType="com.usky.system.domain.SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time