修改用户表，新增user_type字段

对用修改相应sql

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java

@@ -92,6 +92,11 @@ public class AdminUserDO extends TenantBaseDO {
      * 枚举 {@link CommonStatusEnum}
      */
     private Integer status;
+    /**
+     * 用户类型
+     * 1：公司用户  2：工厂用户
+     */
+    private Integer userType;
     /**
      * 最后登录IP
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -38,6 +38,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
+                .eq(AdminUserDO::getUserType, 1)    //查询公司用户
                 .orderByDesc(AdminUserDO::getId));
     }
 
@@ -46,17 +47,24 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     }
 
     default List<AdminUserDO> selectListByStatus(Integer status) {
-        return selectList(AdminUserDO::getStatus, status);
+
+        return selectList(new LambdaQueryWrapperX<AdminUserDO>()
+                .eq(AdminUserDO::getStatus, status)
+                .eq(AdminUserDO::getUserType, 1));
     }
 
     default List<AdminUserDO> selectListByDeptIds(Collection<Long> deptIds) {
-        return selectList(AdminUserDO::getDeptId, deptIds);
+
+        return selectList(new LambdaQueryWrapperX<AdminUserDO>()
+                .in(AdminUserDO::getDeptId, deptIds)
+                .eq(AdminUserDO::getUserType, 1));
     }
 
     default List<AdminUserDO> selectListByDeptId(Long deptId, Long userId) {
         return selectList(new LambdaQueryWrapperX<AdminUserDO>()
                 .eq(AdminUserDO::getDeptId, deptId)
-                .ne(AdminUserDO::getId, userId));
+                .ne(AdminUserDO::getId, userId)
+                .eq(AdminUserDO::getUserType , 1));
     }
 
     void emptyOpenId(@Param("openId") String openId);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -33,12 +33,10 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -544,21 +542,6 @@ public class AdminUserServiceImpl implements AdminUserService {
         return passwordEncoder.encode(password);
     }
 
-    private void IdCardAnalysis(AdminUserDO updateUser) {
-
-        LocalDate nowDate = LocalDate.now();
-
-        String idCard = updateUser.getIdcard();
-
-        //通过身份证号码 获得出生日期
-        LocalDate date = LocalDate.parse(idCard.substring(6, 14));
-        //通过身份证号码 获得性别
-        Integer sex = Integer.parseInt(idCard.substring(16, 17)) % 2 == 0 ? 2 : 1;
-        //通过身份证号码 获得年龄
-        Integer age = nowDate.getYear() - date.getYear();
-
-    }
-
     @Override
     public String getSignImgPath(Long userId) {
         //2L 用户签名

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml

@@ -17,11 +17,14 @@
 
     <select id="selectByDeptIds" resultType="cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserRespVO">
         select a.*, b.name deptName FROM system_users a, system_dept b
-        where a.dept_id = b.id
+        where
-        and a.dept_id in
+            a.dept_id = b.id
-        <foreach collection="list" item="deptIds" open="(" close=")" separator=",">
+            and a.status = 0
-            #{deptIds}
+            and a.user_type = 1
-        </foreach>
+            and a.dept_id in
+            <foreach collection="list" item="deptIds" open="(" close=")" separator=",">
+                #{deptIds}
+            </foreach>
     </select>
 
     <select id="selectUserByBoss">