Merge branch 'han' of uskycloud/usky-cloud into system-165

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

@@ -5,9 +5,11 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.system.controller.web.page.TableDataInfo;
+import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
+import com.usky.system.service.ISysDeptService;
 import com.usky.system.service.ISysPostService;
 import com.usky.system.service.ISysRoleService;
 import com.usky.system.service.ISysUserService;
@@ -40,6 +42,9 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysPostService postService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 获取用户列表
      */
@@ -109,6 +114,10 @@ public class SysUserController extends BaseController
         if(UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique1(user.getPhonenumber(),user.getTenantId()))){
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增手机号'" + user.getPhonenumber() + "'失败，手机号已存在");
         }
+        List<SysDept> list = deptService.deptListByTenant(user.getTenantId());
+        if (list.size() > 0){
+            user.setDeptId(list.get(0).getDeptId());
+        }
         user.setUserType("00");
         user.setTenantId(user.getTenantId());
         user.setCreateBy(user.getUserName());

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

@@ -26,6 +26,8 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
 
     public List<SysDept> deptList(SysDept dept);
 
+    public List<SysDept> deptListByTenant(Integer tenantId);
+
     /**
      * 根据角色ID查询部门树信息
      * 

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

@@ -26,6 +26,8 @@ public interface ISysDeptService extends IService<SysDept>
 
     public List<SysDept> deptList(SysDept dept);
 
+    public List<SysDept> deptListByTenant(Integer tenantId);
+
     /**
      * 构建前端所需要树结构
      * 

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

@@ -69,6 +69,11 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return deptMapper.deptList(dept);
     }
 
+    @Override
+    public List<SysDept> deptListByTenant(Integer tenantId) {
+        return deptMapper.deptListByTenant(tenantId);
+    }
+
 
     @Override
     public List<TreeNode> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users) {

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

@@ -58,6 +58,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		order by d.parent_id, d.order_num
 	</select>
+
+	<select id="deptListByTenant" parameterType="com.usky.system.domain.SysDept" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where d.del_flag = '0'
+		<if test="tenantId != null and tenantId != '' and tenantId != 0">
+			AND tenant_id = #{tenantId}
+		</if>
+		order by d.parent_id, d.order_num
+	</select>
     
     <select id="selectDeptListByRoleId" resultType="Integer">
 		select d.dept_id