企业注销修改

web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java

@@ -51,10 +51,16 @@ public class CorpInfoController {
 
     @ApiOperation("分页")
     @PostMapping("/list")
-    @PreAuthorize("@pms.hasAnyPermission('zgszhgl','zgsqyxxgl','gszhxxgl','qyd-xgf-zhgl')")
+
     public PageResponse<CorpInfoCO> page(@Validated @RequestBody CorpInfoPageQry qry) {
         return corpInfoService.listPage(qry);
     }
+    @ApiOperation("分页")
+    @PostMapping("/basicList")
+    @PreAuthorize("@pms.hasAnyPermission('zgszhgl','zgsqyxxgl','gszhxxgl','qyd-xgf-zhgl')")
+    public PageResponse<CorpInfoCO> pageBasic(@Validated @RequestBody CorpInfoPageQry qry) {
+        return corpInfoService.listPageBasic(qry);
+    }
 
     @ApiOperation("分页")
     @PostMapping("/listNoPms")

web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java

@@ -91,6 +91,12 @@ public class DepartmentController {
         return MultiResponse.of(departmentService.listAllTree());
     }
 
+    @ApiOperation("所有企业下部门树状所有数据根据企业类型")
+    @PostMapping("/listAllTreeByCorpType")
+    public MultiResponse<DepartmentTreeInfoCO> listAllTreeByCorpType( @RequestBody DepartmentTreeQry qry) {
+        return MultiResponse.of(departmentService.listAllTreeByCorpType(qry));
+    }
+
 
 }
 

web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java

@@ -191,7 +191,7 @@ public class UserAddExe {
 //        userRepository.checkUserIdCard(cmd.getId(),cmd.getUserIdCard());
 
         UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
-        if (userExpandInfoDO.getFlowFlag() != null && !userExpandInfoDO.getFlowFlag().equals(cmd.getFlowFlag())) {
+        if (userExpandInfoDO!=null &&userExpandInfoDO.getFlowFlag() != null && !userExpandInfoDO.getFlowFlag().equals(cmd.getFlowFlag())) {
                 // 流动转固定
             List<UserDO> listByPhone = userRepository.getListByPhone(userDO.getPhone(), Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode()));
 
@@ -282,16 +282,17 @@ public class UserAddExe {
         }
 
         UserE userE = new UserE();
-
+        UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
         if (userDO.getCorpinfoId() == null) {
             BeanUtils.copyProperties(cmd, userE);
 
             // user表状态变为入职待审核
             userE.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
+            userE.setFlowFlag(userExpandInfoDO.getFlowFlag());
             userGateway.update(userE);
         } else {
             // 用户有企业id
-            UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
+
             Integer flowFlag = userExpandInfoDO.getFlowFlag();
             if (UserFlowFlagEnum.FIXED.getCode().equals(flowFlag)) {
                 // 固定用户

web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java

@@ -3,8 +3,10 @@ package com.zcloud.basic.info.command;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.cola.dto.Response;
+import com.alibaba.cola.dto.SingleResponse;
 import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.system.client.user.facade.UserFacade;
+import com.jjb.saas.system.client.user.response.UserDetailCO;
 import com.zcloud.basic.info.constant.RedisConstant;
 import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
 import com.zcloud.basic.info.domain.gateway.UserGateway;
@@ -57,11 +59,11 @@ public class UserRemoveExe {
         UserDO userDO = userRepository.getById(cmd.getId());
 
         // 获取redis验证码
-        Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + userDO.getPhone());
+      /*  Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + userDO.getPhone());
         if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){
             throw new BizException("验证码已过期或错误");
         }
-        zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + userDO.getPhone());
+        zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + userDO.getPhone());*/
 
         try {
             //TODO 处理所有未完成的工作，如果是非固定人员，包括所有企业的未完成工作
@@ -72,14 +74,29 @@ public class UserRemoveExe {
             if(CollUtil.isNotEmpty(userDOList)){
                 throw new BizException("您目前还有未离职信息,无法直接注销,请先在\"就职单位\"页面中离职");
             }
-
+            List<UserDO> userDOListALl = userRepository.getListByPhone(userDO.getPhone(),null);
             // 删除用户表
             Long userId = cmd.getId();
-            userGateway.deletedUserById(userId);
+            userGateway.deletedUserByPhone(userDO.getPhone());
+
+
+            userDOListALl.forEach(info -> {
+                SingleResponse<UserDetailCO> detail=null;
+                try {
+                    log.info("updateXgf,GBS获取用户信息{}", info.getId());
+                    detail = userFacade.getDetail(info.getId());
+                    log.info("updateXgf,GBS获取用户信息返回: {}", JSONUtil.toJsonStr(detail));
+
+                if(detail.getData() != null){
+                    log.info("删除底座用户信息,userId:{}",info.getId());
+                    Response delete = userFacade.delete(info.getId());
+                    log.info("删除底座用户信息,userId:{},返回结果:{}",info.getId(), JSONUtil.toJsonStr( delete));
+                }
+                } catch (Exception e) {
+                    log.error("updateXgf,GBS删除用户失败: {}", e.getMessage());
+                }
+            });
 
-            log.info("删除底座用户信息,userId:{}",userId);
-            Response delete = userFacade.delete(cmd.getId());
-            log.info("删除底座用户信息,userId:{},返回结果:{}",userId, JSONUtil.toJsonStr( delete));
 
         } catch (Exception e){
             e.printStackTrace();

web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java

@@ -87,6 +87,10 @@ public class UserUpdateExe {
             }
 
         }
+        if(!Objects.equals(userE.getUserIdCard(), userDO.getUserIdCard())){
+            //判断
+            userRepository.checkUserIdCard(userUpdateCmd.getId(),userUpdateCmd.getUserIdCard());
+        }
 
         CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId());
         if(corpInfoDO != null){
@@ -134,9 +138,9 @@ public class UserUpdateExe {
             }else {
                 // 企业端/监管端
                 boolean res = userGateway.update(userE);
-                if(!userE.getPhone().equals(userDO.getPhone())
-                        || !userE.getEmail().equals(userDO.getEmail())
-                        || !userE.getName().equals(userDO.getName())){
+                if(!Objects.equals(userE.getPhone(), userDO.getPhone())
+                        || !Objects.equals(userE.getEmail(), userDO.getEmail())
+                        || !Objects.equals(userE.getName(), userDO.getName())){
                     // 判断底座是否有该用户信息，如果没有则不调用底座
                     SingleResponse<UserDetailCO> detail = null;
                     try {

web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java

@@ -69,6 +69,32 @@ public class CorpInfoQueryExe {
         if (CollUtil.isEmpty(examCenterCOS)) {
             return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
         }
+        processList(examCenterCOS, pageResponse);
+        return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
+    }
+    /**
+     * 分页
+     *
+     * @param corpInfoPageQry
+     * @return
+     */
+    public PageResponse<CorpInfoCO> executeBasic(CorpInfoPageQry corpInfoPageQry) {
+
+        Map<String, Object> parmas = PageQueryHelper.toHashMap(corpInfoPageQry);
+        if (corpInfoPageQry.getLeCreateTime() != null) {
+            parmas.put("leCreateTime", corpInfoPageQry.getLeCreateTime().plusDays(1));
+        }
+        PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listBasicPage(parmas);
+        List<CorpInfoCO> examCenterCOS = corpInfoCoConvertor.converDOsToCOs(pageResponse.getData());
+        if (CollUtil.isEmpty(examCenterCOS)) {
+            return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
+        }
+        processList(examCenterCOS, pageResponse);
+        return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
+    }
+
+    private void processList(List<CorpInfoCO> examCenterCOS, PageResponse<CorpInfoDO> pageResponse){
+
         //examCenterCOS获取id集合
         List<Long> corpInfoIdList = examCenterCOS.stream().map(CorpInfoCO::getId).collect(Collectors.toList());
         List<CorpFormDO> corpFormDOList = corpFormRepository.getCorpListByTypeList(corpInfoIdList, Arrays.asList(CorpFormTypeEnum.SELECTFROM.getCode()));
@@ -84,7 +110,6 @@ public class CorpInfoQueryExe {
                         .collect(Collectors.joining(",")));
             }
         });
-        return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
 
     public PageResponse<CorpInfoCO> executeNoPms(CorpInfoPageQry corpInfoPageQry) {

web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor;
 import com.zcloud.basic.info.domain.enums.CommonFlagEnum;
+import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.dto.*;
 import com.zcloud.basic.info.dto.clientobject.*;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
@@ -152,13 +153,17 @@ public class DepartmentQueryExe {
     }
 
     public List<DepartmentTreeInfoCO> listAllTree() {
-
         List<DepartmentDO> pageResponse = departmentRepository.listAllTree();
         if (CollUtil.isEmpty(pageResponse)) {
             return Collections.emptyList();
         }
+        List<DepartmentTreeInfoCO> result2 = getDepartmentAllTree(pageResponse);
+        return result2;
+    }
+
+    private List<DepartmentTreeInfoCO> getDepartmentAllTree(List<DepartmentDO> pageResponse) {
         List<DepartmentTreeInfoCO> examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse);
-        Map<Long, String> corpinfoMap = corpInfoRepository.getCorpinfoNameByCorpinfoId(examCenterCOS.stream().map(DepartmentTreeInfoCO::getCorpinfoId).collect(Collectors.toList()));
+        Map<Long, String> corpinfoMap = corpInfoRepository.getCorpinfoNameByCorpinfoId(examCenterCOS.stream().map(DepartmentTreeInfoCO::getCorpinfoId).distinct().collect(Collectors.toList()));
         if (CollUtil.isNotEmpty(corpinfoMap)) {
             List<Long> departmentIds = examCenterCOS.stream().peek(examCenterCO -> {
                 examCenterCO.setCorpinfoName(corpinfoMap.getOrDefault(examCenterCO.getCorpinfoId(), StringUtils.EMPTY));
@@ -179,9 +184,23 @@ public class DepartmentQueryExe {
                 result2.addAll(departmentTreeInfoCOS);
             }
         });
-
-
         return result2;
     }
+
+    public Collection<DepartmentTreeInfoCO> listAllTreeByCorpType(DepartmentTreeQry qry) {
+        Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
+        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) parmas.get("enterpriseType"));
+        if (CollUtil.isNotEmpty(enterpriseType)) {
+            parmas.put("corpinfoTypeList",enterpriseType);
+        }
+        List<DepartmentDO> pageResponse = departmentRepository.listAllTreeByCorpType(parmas);
+        if (CollUtil.isEmpty(pageResponse)) {
+            return Collections.emptyList();
+        }
+        List<DepartmentTreeInfoCO> result2 = getDepartmentAllTree(pageResponse);
+        return result2;
+    }
+
+
 }
 

web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java

@@ -242,7 +242,9 @@ public class UserQueryExe {
         //判断用户信息是否完善
         UserE userCheck = new UserE();
         BeanUtils.copyProperties(userDO, userCheck);
-        Boolean b = userCheck.checkUserInfoComplete(userCheck);
+        UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
+        Boolean b = userCheck.checkUserInfoComplete(userCheck,userExpandInfoDO==null?null:userExpandInfoDO.getFlowFlag());
+
         userLoginCO.setIsInfoComplete(b);
 
         List<Long> userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList());

web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java

@@ -42,6 +42,11 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
 
         return corpInfoQueryExe.execute(qry);
     }
+    @Override
+    public PageResponse<CorpInfoCO> listPageBasic(CorpInfoPageQry qry) {
+
+        return corpInfoQueryExe.executeBasic(qry);
+    }
 
     @Override
     public PageResponse<CorpInfoCO> listPageNoPms(CorpInfoPageQry qry) {

web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java

@@ -88,6 +88,13 @@ public class DepartmentServiceImpl implements DepartmentServiceI {
     public List<DepartmentTreeInfoCO> listAllTree() {
         return departmentQueryExe.listAllTree();
     }
+
+    @Override
+    public Collection<DepartmentTreeInfoCO> listAllTreeByCorpType(DepartmentTreeQry qry) {
+        return departmentQueryExe.listAllTreeByCorpType(qry);
+
+    }
+
     @Override
     @Cacheable(value = "deptAllNameCache", key="'deptId:'+#deptId")
     public String getFullNameForList(Long deptId, List<DepartmentCO> list) {

web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java

@@ -18,6 +18,7 @@ import java.util.List;
  */
 public interface CorpInfoServiceI {
     PageResponse<CorpInfoCO> listPage(CorpInfoPageQry qry);
+    PageResponse<CorpInfoCO> listPageBasic(CorpInfoPageQry qry);
     PageResponse<CorpInfoCO> listPageNoPms(CorpInfoPageQry qry);
 
     MultiResponse<CorpInfoCO> listAll(CorpInfoQry corpInfoQry);

web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java

@@ -43,5 +43,6 @@ public interface DepartmentServiceI {
     String getFullNameForList(Long deptId, List<DepartmentCO> list);
 
 
+    Collection<DepartmentTreeInfoCO> listAllTreeByCorpType(DepartmentTreeQry qry);
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java

@@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * web-client
@@ -29,6 +31,11 @@ public class DepartmentTreeQry {
     private Long eqCorpinfoId;
     @ApiModelProperty(value = "父id", name = "eqParentId")
     private Long eqParentId;
+    @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "corpinfoTypeList")
+    private List<Integer> corpinfoTypeList;
+
+    @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType")
+    private Integer enterpriseType;
 
 
 }

web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java

@@ -46,6 +46,8 @@ public class UserPageQry extends PageQuery {
     private String eqPersonnelType;
     @ApiModelProperty(value = "身份证号")
     private String likeUserIdCard;
+    @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员")
+    private String eqFlowFlag;
 
 
     private String menuPath;

web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java

@@ -26,12 +26,13 @@ public class UserQryCmd {
     private String eqCorpinfoId;
     private String eqDepartmentId;
     private String eqPostId;
-    private Integer eqEmploymentFlag;
+    private String eqEmploymentFlag;
 
     private Long corpinfoId;
     private Long departmentId;
     private Long postId;
     private String username;
     private Integer noMain;
+    private String isMyCorp;
 }
 

web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java

@@ -17,7 +17,8 @@ public enum CorpTypeEnum {
     share(2,"股份单位",UserTypeEnum.JG.getCode()),
     serviceProvider(3, "相关方企业",UserTypeEnum.XGF.getCode()),
     cargoOwner(4, "货主单位",UserTypeEnum.XGF.getCode()),
-    portUnit(5, "驻港单位",UserTypeEnum.XGF.getCode());
+    portUnit(5, "驻港单位",UserTypeEnum.XGF.getCode()),
+    materialCenter(6, "物资中心",UserTypeEnum.QY.getCode());
 
     private static final Map<Integer, List<Integer>> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>();
 

web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java

@@ -57,5 +57,6 @@ public interface UserGateway {
 
     void updateXgf(UserE userE, Long id);
 
+    void deletedUserByPhone(String phone);
 }
 

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java

@@ -188,7 +188,7 @@ public class CorpInfoE extends BaseE {
 
     public void checkList(int size){
         if(size > 0){
-            throw new BizException("社会统一信用代码重复。");
+            throw new BizException("统一社会信用代码重复。");
         }
     }
     public static Boolean isCorp() {

web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java

@@ -161,11 +161,11 @@ public class UserE extends BaseE {
     // 微信openid
     private String openId;
 
-    public static Boolean checkUserInfoComplete(UserE userE) {
+    public static Boolean checkUserInfoComplete(UserE userE, Integer flowFlag) {
         return StringUtils.isNotEmpty(userE.getUsername()) &&
                 StringUtils.isNotEmpty(userE.getPhone()) &&
                 StringUtils.isNotEmpty(userE.getUserIdCard()) &&
-                userE.getFlowFlag() != null;
+                flowFlag != null;
     }
 
 

web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java

@@ -2,6 +2,7 @@ package com.zcloud.basic.info.gatewayimpl;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.cola.dto.Response;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.jjb.saas.system.client.user.facade.UserFacade;
 import com.jjb.saas.system.client.user.request.RoleDeptAddCmd;
@@ -221,5 +222,11 @@ public class UserGatewayImpl implements UserGateway {
         this.update(userE);
         userRepository.updateXgf(userE);
     }
+
+    @Override
+    public void deletedUserByPhone(String phone) {
+
+        userRepository.deletedUserByPhone(phone);
+    }
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 @Mapper
 @DataScopes({
-        @DataScope(method = "selectUserPage", menuPerms = ""),
+        @DataScope(method = "selectUserBasicPage", menuPerms = ""),
         @DataScope(method = "corpUserMiddlePage", menuPerms = ""),
 })
 public interface CorpInfoMapper extends BaseMapper<CorpInfoDO> {
@@ -28,6 +28,7 @@ public interface CorpInfoMapper extends BaseMapper<CorpInfoDO> {
     IPage<CorpInfoDO> corpUserMiddlePage(IPage<CorpInfoDO> iPage, Map<String, Object> params, String menuPerms);
 
     IPage<CorpInfoDO> selectUserPage(IPage<CorpInfoDO> iPage, @Param("ew") QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms);
+    IPage<CorpInfoDO> selectUserBasicPage(IPage<CorpInfoDO> iPage, @Param("ew") QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms);
 
     IPage<CorpInfoDO> selectUserPageNoPms(IPage<CorpInfoDO> iPage, @Param("ew") QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms);
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * web-infrastructure
@@ -26,5 +27,7 @@ public interface DepartmentMapper extends BaseMapper<DepartmentDO> {
 
     List<DepartmentDO> listAllTree();
     IPage<DepartmentDO> selectDeptPage(IPage<DepartmentDO> iPage, @Param("ew") QueryWrapper<DepartmentDO> queryWrapper, String menuPerms);
+
+    List<DepartmentDO> listAllTreeByCorpType(Map<String, Object> parmas);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java

@@ -39,5 +39,7 @@ public interface UserMapper extends BaseMapper<UserDO> {
     IPage<UserDO> listXgf(IPage<UserDO> iPage, Map<String, Object> params, String menuPerms);
 
     List<UserCorpInfoDO> getListByUserIds(List<Long> userIds);
+
+    void deletedUserByPhone(String phone);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java

@@ -15,6 +15,7 @@ import java.util.Map;
  */
 public interface CorpInfoRepository extends BaseRepository<CorpInfoDO> {
     PageResponse<CorpInfoDO> listPage(Map<String, Object> parmas);
+    PageResponse<CorpInfoDO> listBasicPage(Map<String, Object> parmas);
     PageResponse<CorpInfoDO> listPageNoPms(Map<String, Object> parmas);
     List<CorpInfoDO> listAll(Map<String, Object> params);
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java

@@ -36,5 +36,7 @@ public interface DepartmentRepository extends BaseRepository<DepartmentDO> {
     List<DepartmentDO> listAllTree();
 
     boolean existsByName(@NotEmpty(message = "名称不能为空") String name);
+
+    List<DepartmentDO> listAllTreeByCorpType(Map<String, Object> parmas);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java

@@ -81,7 +81,7 @@ public interface UserRepository extends BaseRepository<UserDO> {
 
     UserDO getByPhoneAndIdCard(String phone, String idCardNumber);
 
-    void checkUserIdCard(@NotNull(message = "手机号不能为空") String phone, String userIdCard);
+    void checkUserIdCard( Long id, String userIdCard);
 
     List<UserDO> getListByPhone(String phone,List<Integer> employmentFlagList);
 
@@ -90,5 +90,7 @@ public interface UserRepository extends BaseRepository<UserDO> {
     List<UserDO> getByIdCard(String userIdCard, List<Integer> employmentFlagList);
 
     void updateXgf(UserE userE);
+
+    void deletedUserByPhone(String phone);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -66,21 +66,33 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
     public PageResponse<CorpInfoDO> listPage(Map<String, Object> params) {
         IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
         QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
+        String menuPerms = "";
+        initParams(queryWrapper, menuPerms, params);
+        IPage<CorpInfoDO> result = corpInfoMapper.selectUserPage(iPage, queryWrapper, menuPerms);
+        return PageHelper.pageToResponse(result, result.getRecords());
+    }
+    @Override
+    public PageResponse<CorpInfoDO> listBasicPage(Map<String, Object> params) {
+        IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
+        QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
+        String menuPerms = "";
+        initParams(queryWrapper, menuPerms, params);
+        IPage<CorpInfoDO> result = corpInfoMapper.selectUserBasicPage(iPage, queryWrapper, menuPerms);
+        return PageHelper.pageToResponse(result, result.getRecords());
+    }
+    private void initParams(QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms, Map<String, Object> params){
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
         List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
         if (CollUtil.isNotEmpty(enterpriseType)) {
             queryWrapper.in("type", enterpriseType);
         }
         queryWrapper.orderByAsc("corp_order").orderByDesc("create_time");
-        String menuPerms = "";
+
         if (!ObjectUtils.isEmpty(params.get("menuPath"))) {
             menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
         }
         queryWrapper.eq("delete_enum", "FALSE");
-        IPage<CorpInfoDO> result = corpInfoMapper.selectUserPage(iPage, queryWrapper, menuPerms);
-        return PageHelper.pageToResponse(result, result.getRecords());
     }
-
     @Override
     public PageResponse<CorpInfoDO> listPageNoPms(Map<String, Object> params) {
         IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java

@@ -130,6 +130,11 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
        return departmentMapper.listAllTree();
     }
 
+    @Override
+    public List<DepartmentDO> listAllTreeByCorpType(Map<String, Object> parmas) {
+        return departmentMapper.listAllTreeByCorpType(parmas);
+    }
+
     @Override
     public boolean existsByName(String name) {
         QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java

@@ -141,8 +141,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
 //        List<Long> ids = new ArrayList<>();
 //        ids.add(1999009782763397120L);
 //        Map<Long, String> sd1 = zcloudDepartmentFacade.listFullName(ids);
-
-        if (ObjectUtils.isEmpty(params.get("corpinfoId"))) {
+        if (!ObjectUtils.isEmpty(params.get("eqEmploymentFlag"))){
+            params.put("employmentFlag", params.get("eqEmploymentFlag"));
+        }
+        if (!ObjectUtils.isEmpty(params.get("isMyCorp"))) {
             SSOUser ssoUser = AuthContext.getCurrentUser();
             params.put("corpinfoId", ssoUser.getTenantId());
         }
@@ -256,6 +258,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         if (userDo.getUserId() == null) {
             userDo.setUserId(Tools.get32UUID());
         }
+        // 新增企业时，主账号默认入职
+        userDo.setEmploymentFlag(1);
         save(userDo);
         userE.setId(userDo.getId());
     }
@@ -430,7 +434,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         if (multiResponse.isSuccess()) {
             List<RoleCO> roleCOList = multiResponse.getData();
             for (RoleCO roleCO : roleCOList) {
-                if ("默认通用角色".equals(roleCO.getRoleName())) {
+                if (roleCO.getRoleName().contains("普通用户") || roleCO.getRoleName().contains("个人账号")) {
                     return roleCO.getId();
                 }
             }
@@ -531,10 +535,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
     }
 
     @Override
-    public void checkUserIdCard(String phone, String userIdCard) {
+    public void checkUserIdCard(Long id, String userIdCard) {
         Map<String, Object> verifyParam = new HashMap<>();
         verifyParam.put("userIdCard", userIdCard);
-        verifyParam.put("phone", phone);
+        verifyParam.put("id", id);
         Integer count = userMapper.countUser(verifyParam);
         if (count > 0) {
             throw new BizException("身份证号已经存在，请联系管理员");
@@ -605,5 +609,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
             }
         }
     }
+
+    @Override
+    public void deletedUserByPhone(String phone) {
+        userMapper.deletedUserByPhone(phone);
+    }
 }
 

web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml

@@ -46,7 +46,12 @@
     <select id="selectUserPage" resultType="com.zcloud.basic.info.persistence.dataobject.CorpInfoDO">
         SELECT *
         FROM corp_info
-            ${ew.customSqlSegment}
+                 ${ew.customSqlSegment}
+    </select>
+    <select id="selectUserBasicPage" resultType="com.zcloud.basic.info.persistence.dataobject.CorpInfoDO">
+        SELECT *
+        FROM corp_info
+                 ${ew.customSqlSegment}
     </select>
 
     <select id="selectUserPageNoPms" resultType="com.zcloud.basic.info.persistence.dataobject.CorpInfoDO">

web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml

@@ -5,12 +5,26 @@
 <mapper namespace="com.zcloud.basic.info.persistence.mapper.DepartmentMapper">
 
      <select id="listAllTree" resultType="com.zcloud.basic.info.persistence.dataobject.DepartmentDO">
-        select * from department where delete_enum = 'FALSE' order by dep_order, create_time desc
+         select * from department where delete_enum = 'FALSE' order by dep_order, create_time desc
     </select>
     <select id="selectDeptPage" resultType="com.zcloud.basic.info.persistence.dataobject.DepartmentDO">
         SELECT *
         FROM department
                  ${ew.customSqlSegment}
     </select>
+    <select id="listAllTreeByCorpType" resultType="com.zcloud.basic.info.persistence.dataobject.DepartmentDO">
+        select d.*
+        from department d
+        left join corp_info c on d.corpinfo_id = c.id
+        where d.delete_enum = 'FALSE'
+        and c.delete_enum = 'FALSE'
+        <if test="corpinfoTypeList != null and corpinfoTypeList.size() > 0">
+            and c.type in
+            <foreach collection="corpinfoTypeList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        order by d.dep_order, d.create_time desc
+    </select>
 </mapper>
 

web-infrastructure/src/main/resources/mapper/UserMapper.xml

@@ -81,6 +81,11 @@
             <if test="params.departmentId != null">
                 and u.department_id = #{params.departmentId}
             </if>
+            <if test="params.employmentFlag != null">
+                and u.employment_flag = #{params.employmentFlag}
+            </if>
+
+
             <if test="params.postId != null">
                 and u.post_id = #{params.postId}
             </if>
@@ -143,6 +148,7 @@
             u.political_affiliation,
             u.political_affiliation_name,
             u.employment_flag,
+            u.flow_flag,
             CASE
                 WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
                     AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN
@@ -169,9 +175,10 @@
         select
         d.name as department_name,
         CASE
-        WHEN c.type IN (1, 2, 3) THEN u.post_name
+        WHEN c.type IN (3,4, 5) THEN u.post_name
         ELSE p.post_name
         END AS post_name,
+        c.corp_name corpinfo_name,
         u.id,
         u.password,
         u.user_id,
@@ -355,5 +362,8 @@
         and u.employment_flag =1
         and u.delete_enum = 'FALSE'
     </select>
+    <update id="deletedUserByPhone">
+        update user set delete_enum = 'TRUE' where phone = #{phone}
+    </update>
 </mapper>