Merge remote-tracking branch 'origin/main' into main

pom.xml

@@ -13,6 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <jjb.saas.system.client.version>1.7.0-SNAPSHOT</jjb.saas.system.client.version>
   </properties>
   <dependencies>
     <dependency>
@@ -20,11 +21,6 @@
       <artifactId>zcloud_gbscommon</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-core</artifactId>
-      <version>1.9.0</version>
-    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
@@ -54,6 +50,11 @@
         <artifactId>web-infrastructure</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.jjb.saas</groupId>
+        <artifactId>jjb-saas-system-client</artifactId>
+        <version>${jjb.saas.system.client.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>

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

@@ -40,8 +40,7 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade {
     @Override
     public SingleResponse<ZcloudUserCo> getInfoByUserId(Long aLong) {
         UserCO user = userServiceI.getInfoByUserId(aLong);
-        ZcloudUserCo zcloudUserCo = new ZcloudUserCo();
+        ZcloudUserCo zcloudUserCo = userCoConvertor.converCOToDubboCO(user);
-        BeanUtils.copyProperties(user, zcloudUserCo);
         return SingleResponse.of(zcloudUserCo);
     }
 

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

@@ -43,8 +43,7 @@ public class UserController {
         SSOUser ssoUser = AuthContext.getCurrentUser();
         List<UserCO> userCOS = translateField.translateZcloudCommonInformation(Arrays.asList(cmd), UserCO.class);
         ZcloudDepartmentInfoCo zcloudDpetInfoById = translateField.getZcloudDpetInfoById(1985993429287899137L);
-        ZcloudUserCo zcloudUserInfoById = translateField.getZcloudUserInfoById(1985906883444662274L);
+        ZcloudUserCo zcloudUserInfoById = translateField.getZcloudUserInfoById(1985972624130953218L);
-
         return SingleResponse.of(cmd);
     }
 

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

@@ -0,0 +1,83 @@
+package com.zcloud.basic.info.web;
+
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.PageResponse;
+import com.alibaba.cola.dto.Response;
+import com.alibaba.cola.dto.SingleResponse;
+import com.jjb.saas.framework.auth.model.SSOUser;
+import com.jjb.saas.framework.auth.utils.AuthContext;
+import com.zcloud.basic.info.api.UserEmploymentLogServiceI;
+import com.zcloud.basic.info.dto.UserEmploymentLogAddCmd;
+import com.zcloud.basic.info.dto.UserEmploymentLogPageQry;
+import com.zcloud.basic.info.dto.UserEmploymentLogQryCmd;
+import com.zcloud.basic.info.dto.UserEmploymentLogUpdateCmd;
+import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+
+/**
+ * web-adapter
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Api(tags = "用户资质信息")
+@RequestMapping("/${application.gateway}/userEmploymentLog")
+@RestController
+@AllArgsConstructor
+public class UserEmploymentLogController {
+    private final UserEmploymentLogServiceI userEmploymentLogService;
+
+    @ApiOperation("新增")
+    @PostMapping("/save")
+    public SingleResponse<UserEmploymentLogCO> add(@Validated @RequestBody UserEmploymentLogAddCmd cmd) {
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        return userEmploymentLogService.add(cmd);
+    }
+
+    @ApiOperation("分页")
+    @PostMapping("/list")
+    public PageResponse<UserEmploymentLogCO> page(@RequestBody UserEmploymentLogPageQry qry) {
+        return userEmploymentLogService.listPage(qry);
+    }
+
+    @ApiOperation("所有数据")
+    @GetMapping("/listAll")
+    public MultiResponse<UserEmploymentLogCO> listAll(UserEmploymentLogQryCmd qry) {
+        return userEmploymentLogService.listAll(qry);
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("/{id}")
+    public SingleResponse<UserEmploymentLogCO> getInfoById(@PathVariable("id") Long id) {
+        return SingleResponse.of(new UserEmploymentLogCO());
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("/{id}")
+    public Response remove(@PathVariable("id") Long id) {
+        userEmploymentLogService.remove(id);
+        return SingleResponse.buildSuccess();
+    }
+
+    @ApiOperation("删除多个")
+    @DeleteMapping("/ids")
+    public Response removeBatch(@RequestParam Long[] ids) {
+        userEmploymentLogService.removeBatch(ids);
+        return SingleResponse.buildSuccess();
+    }
+
+    @ApiOperation("修改")
+    @PutMapping("/edit")
+    public SingleResponse edit(@Validated @RequestBody UserEmploymentLogUpdateCmd userEmploymentLogUpdateCmd) {
+        userEmploymentLogService.edit(userEmploymentLogUpdateCmd);
+        return SingleResponse.buildSuccess();
+    }
+}
+

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

@@ -7,10 +7,13 @@ import com.jjb.saas.system.client.role.facade.RoleFacade;
 import com.jjb.saas.system.client.user.facade.UserFacade;
 import com.jjb.saas.system.client.user.request.FacadeUserAddCmd;
 import com.zcloud.basic.info.command.convertor.UserCoConvertor;
+import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway;
 import com.zcloud.basic.info.domain.gateway.UserGateway;
 import com.zcloud.basic.info.domain.model.UserE;
+import com.zcloud.basic.info.domain.model.UserEmploymentLogE;
 import com.zcloud.basic.info.dto.UserAddCmd;
 import com.zcloud.basic.info.dto.UserXgfAddCmd;
+import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO;
 import com.zcloud.gbscommon.utils.Tools;
 import lombok.AllArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -33,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 public class UserAddExe {
     private final UserGateway userGateway;
     private UserCoConvertor userCoConvertor;
+    private final UserEmploymentLogGateway userEmploymentLogGateway;
 //    @Autowired
 //    private RedisTemplate<String, Object> redisTemplate;
     @DubboReference(check = false)
@@ -47,9 +51,13 @@ public class UserAddExe {
         UserE userE = new UserE();
         BeanUtils.copyProperties(cmd, userE);
         userE.initAdd(tenantId, userE);
+        UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE();
+        BeanUtils.copyProperties(userE, userEmploymentLogE);
+        userEmploymentLogE.initAdd(userEmploymentLogE);
         boolean res = false;
         try {
             res = userGateway.add(userE);
+            userEmploymentLogGateway.add(userEmploymentLogE);
 //            FacadeUserAddCmd facadeUserAddCmd = new FacadeUserAddCmd();
 //            facadeUserAddCmd.setAccount(userE.getUsername());
 //                    FacadeUserAddCmd facadeUserAddCmd = userCoConvertor.converEToFacadeUserAddCmd(userE);

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

@@ -0,0 +1,40 @@
+package com.zcloud.basic.info.command;
+
+import com.alibaba.cola.exception.BizException;
+import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway;
+import com.zcloud.basic.info.domain.model.UserEmploymentLogE;
+import com.zcloud.basic.info.dto.UserEmploymentLogAddCmd;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * web-app
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:36
+ */
+@Component
+@AllArgsConstructor
+public class UserEmploymentLogAddExe {
+    private final UserEmploymentLogGateway userEmploymentLogGateway;
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean execute(UserEmploymentLogAddCmd cmd) {
+        UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE();
+        BeanUtils.copyProperties(cmd, userEmploymentLogE);
+        boolean res = false;
+        try {
+            res = userEmploymentLogGateway.add(userEmploymentLogE);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        if (!res) {
+            throw new BizException("保存失败");
+        }
+        return true;
+    }
+}
+

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

@@ -0,0 +1,39 @@
+package com.zcloud.basic.info.command;
+
+import com.alibaba.cola.exception.BizException;
+import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * web-app
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Component
+@AllArgsConstructor
+public class UserEmploymentLogRemoveExe {
+    private final UserEmploymentLogGateway userEmploymentLogGateway;
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean execute(Long id) {
+        boolean res = userEmploymentLogGateway.deletedUserEmploymentLogById(id);
+        if (!res) {
+            throw new BizException("删除失败");
+        }
+        return true;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean execute(Long[] ids) {
+        boolean res = userEmploymentLogGateway.deletedUserEmploymentLogByIds(ids);
+        if (!res) {
+            throw new BizException("删除失败");
+        }
+        return true;
+    }
+}
+

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

@@ -0,0 +1,34 @@
+package com.zcloud.basic.info.command;
+
+import com.alibaba.cola.exception.BizException;
+import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway;
+import com.zcloud.basic.info.domain.model.UserEmploymentLogE;
+import com.zcloud.basic.info.dto.UserEmploymentLogUpdateCmd;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * web-app
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:38
+ */
+@Component
+@AllArgsConstructor
+public class UserEmploymentLogUpdateExe {
+    private final UserEmploymentLogGateway userEmploymentLogGateway;
+
+    @Transactional(rollbackFor = Exception.class)
+    public void execute(UserEmploymentLogUpdateCmd userEmploymentLogUpdateCmd) {
+        UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE();
+        BeanUtils.copyProperties(userEmploymentLogUpdateCmd, userEmploymentLogE);
+        boolean res = userEmploymentLogGateway.update(userEmploymentLogE);
+        if (!res) {
+            throw new BizException("修改失败");
+        }
+    }
+}
+

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

@@ -23,8 +23,10 @@ public interface UserCoConvertor {
     * @return
     */
     List<UserCO> converDOsToCOs(List<UserDO> userDOs);
+    UserCO converDOToCO(UserDO userDO);
     FacadeUserAddCmd converEToFacadeUserAddCmd(UserE userE);
 
     List<ZcloudUserCo> converCOsToDubboCOs(List<UserCO> userCOList);
+    ZcloudUserCo converCOToDubboCO(UserCO userCO);
 }
 

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

@@ -0,0 +1,24 @@
+package com.zcloud.basic.info.command.convertor;
+
+import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO;
+import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+
+/**
+ * web-app
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Mapper(componentModel = "spring")
+public interface UserEmploymentLogCoConvertor {
+    /**
+     * @param userEmploymentLogDOs
+     * @return
+     */
+    List<UserEmploymentLogCO> converDOsToCOs(List<UserEmploymentLogDO> userEmploymentLogDOs);
+}
+

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

@@ -0,0 +1,59 @@
+package com.zcloud.basic.info.command.query;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.PageResponse;
+import com.zcloud.basic.info.command.convertor.UserEmploymentLogCoConvertor;
+import com.zcloud.basic.info.dto.UserEmploymentLogPageQry;
+import com.zcloud.basic.info.dto.UserEmploymentLogQryCmd;
+import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO;
+import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO;
+import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository;
+import com.zcloud.gbscommon.utils.PageQueryHelper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * web-app
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Component
+@AllArgsConstructor
+public class UserEmploymentLogQueryExe {
+    private final UserEmploymentLogRepository userEmploymentLogRepository;
+    private final UserEmploymentLogCoConvertor userEmploymentLogCoConvertor;
+
+    /**
+     * 分页
+     *
+     * @param userEmploymentLogPageQry
+     * @return
+     */
+    public PageResponse<UserEmploymentLogCO> execute(UserEmploymentLogPageQry userEmploymentLogPageQry) {
+        Map<String, Object> params = PageQueryHelper.toHashMap(userEmploymentLogPageQry);
+        PageResponse<UserEmploymentLogDO> pageResponse = userEmploymentLogRepository.listPage(params);
+        List<UserEmploymentLogCO> examCenterCOS = userEmploymentLogCoConvertor.converDOsToCOs(pageResponse.getData());
+        return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
+    }
+    /**
+     * 列表
+     *
+     * @param userEmploymentLogQryCmd
+     * @return
+     */
+    public MultiResponse<UserEmploymentLogCO> executeListAll(UserEmploymentLogQryCmd userEmploymentLogQryCmd) {
+        Map<String, Object> params = PageQueryHelper.toHashMap(userEmploymentLogQryCmd);
+        List<UserEmploymentLogDO> userEmploymentLogDOList = userEmploymentLogRepository.listAll(params);
+        List<UserEmploymentLogCO> userEmploymentLogCOList = userEmploymentLogCoConvertor.converDOsToCOs(userEmploymentLogDOList);
+        return MultiResponse.of(userEmploymentLogCOList);
+    }
+
+
+
+}
+

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

@@ -112,9 +112,7 @@ public class UserQueryExe {
 
     public UserCO getInfoByUserId(Long aLong) {
         UserDO byId = userRepository.getById(aLong);
-        UserCO userCO = new UserCO();
+        return userCoConvertor.converDOToCO(byId);
-        BeanUtils.copyProperties(byId,userCO);
-        return userCO;
     }
 }
 

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

@@ -49,15 +49,6 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
 //        Long userId = AuthContext.getUserId();
         cmd.setCorpinfoId(Tools.get32UUID());
         Long id = corpInfoAddExe.execute(cmd);
-
-        //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan
-//        SysUserAddCmd user = new SysUserAddCmd();
-//        to do 完善
-//        user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName())
-//                .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex())
-//                .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0")
-//                .setDepartmentId(id);
-//        sysUserAddExe.execute(user);
         return SingleResponse.buildSuccess();
     }
 

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

@@ -41,13 +41,7 @@ public class CorpInfoXgfServiceImpl implements CorpInfoXgfServiceI {
         Long userId = AuthContext.getUserId();
         Long id = corpInfoXgfAddExe.execute(cmd);
         //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan
-//        SysUserAddCmd user = new SysUserAddCmd();
 //       todo 再完善
-//        user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName())
-//                .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex())
-//                .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0")
-//                .setDepartmentId(id);
-//        sysUserAddExe.execute(user);
         return SingleResponse.buildSuccess();
     }
 

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

@@ -0,0 +1,66 @@
+package com.zcloud.basic.info.service;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.PageResponse;
+import com.alibaba.cola.dto.SingleResponse;
+import com.zcloud.basic.info.api.UserEmploymentLogServiceI;
+import com.zcloud.basic.info.command.UserEmploymentLogAddExe;
+import com.zcloud.basic.info.command.UserEmploymentLogRemoveExe;
+import com.zcloud.basic.info.command.UserEmploymentLogUpdateExe;
+import com.zcloud.basic.info.command.query.UserEmploymentLogQueryExe;
+import com.zcloud.basic.info.dto.UserEmploymentLogAddCmd;
+import com.zcloud.basic.info.dto.UserEmploymentLogPageQry;
+import com.zcloud.basic.info.dto.UserEmploymentLogQryCmd;
+import com.zcloud.basic.info.dto.UserEmploymentLogUpdateCmd;
+import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * web-app
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Service
+@AllArgsConstructor
+public class UserEmploymentLogServiceImpl implements UserEmploymentLogServiceI {
+    private final UserEmploymentLogAddExe userEmploymentLogAddExe;
+    private final UserEmploymentLogUpdateExe userEmploymentLogUpdateExe;
+    private final UserEmploymentLogRemoveExe userEmploymentLogRemoveExe;
+    private final UserEmploymentLogQueryExe userEmploymentLogQueryExe;
+
+    @Override
+    public PageResponse<UserEmploymentLogCO> listPage(UserEmploymentLogPageQry qry) {
+
+        return userEmploymentLogQueryExe.execute(qry);
+    }
+
+    @Override
+    public SingleResponse add(UserEmploymentLogAddCmd cmd) {
+
+        userEmploymentLogAddExe.execute(cmd);
+        return SingleResponse.buildSuccess();
+    }
+
+    @Override
+    public void edit(UserEmploymentLogUpdateCmd userEmploymentLogUpdateCmd) {
+        userEmploymentLogUpdateExe.execute(userEmploymentLogUpdateCmd);
+    }
+
+    @Override
+    public void remove(Long id) {
+        userEmploymentLogRemoveExe.execute(id);
+    }
+
+    @Override
+    public void removeBatch(Long[] ids) {
+        userEmploymentLogRemoveExe.execute(ids);
+    }
+
+    @Override
+    public MultiResponse<UserEmploymentLogCO> listAll(UserEmploymentLogQryCmd qry) {
+        return userEmploymentLogQueryExe.executeListAll(qry);
+    }
+}
+

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

@@ -0,0 +1,31 @@
+package com.zcloud.basic.info.api;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.PageResponse;
+import com.alibaba.cola.dto.SingleResponse;
+import com.zcloud.basic.info.dto.UserEmploymentLogAddCmd;
+import com.zcloud.basic.info.dto.UserEmploymentLogPageQry;
+import com.zcloud.basic.info.dto.UserEmploymentLogQryCmd;
+import com.zcloud.basic.info.dto.UserEmploymentLogUpdateCmd;
+import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO;
+
+/**
+ * web-client
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+public interface UserEmploymentLogServiceI {
+    PageResponse<UserEmploymentLogCO> listPage(UserEmploymentLogPageQry qry);
+
+    SingleResponse<UserEmploymentLogCO> add(UserEmploymentLogAddCmd cmd);
+
+    void edit(UserEmploymentLogUpdateCmd cmd);
+
+    void remove(Long id);
+
+    void removeBatch(Long[] ids);
+
+    MultiResponse<UserEmploymentLogCO> listAll(UserEmploymentLogQryCmd qry);
+}
+

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

@@ -85,10 +85,10 @@ public class UserAddCmd extends Command {
 
     @ApiModelProperty(value = "户口所在地", name = "locationAddress")
     private String locationAddress;
-    @ApiModelProperty(value = "职级", name = "rank")
+    @ApiModelProperty(value = "职级", name = "rankLevel")
-    private String rank;
+    private String rankLevel;
-    @ApiModelProperty(value = "职级名称", name = "rank_name")
+    @ApiModelProperty(value = "职级名称", name = "rankLevelName")
-    private String rank_name;
+    private String rankLevelName;
 
     // TODO 待确认企业端和监管端是否必填
     @ApiModelProperty(value = "人员在部门中的排序", name = "sort")

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

@@ -0,0 +1,57 @@
+package com.zcloud.basic.info.dto;
+
+import com.alibaba.cola.dto.Command;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * web-client
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:36
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserEmploymentLogAddCmd extends Command {
+    @ApiModelProperty(value = "用户id", name = "userId", required = true)
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
+    @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true)
+    @NotNull(message = "企业id不能为空")
+    private Long corpinfoId;
+
+    @ApiModelProperty(value = "企业名称", name = "corpinfoName", required = true)
+    @NotEmpty(message = "企业名称不能为空")
+    private String corpinfoName;
+
+    @ApiModelProperty(value = "部门id", name = "departmentId", required = true)
+    @NotNull(message = "部门id不能为空")
+    private Long departmentId;
+
+    @ApiModelProperty(value = "部门名称", name = "departmentName", required = true)
+    @NotEmpty(message = "部门名称不能为空")
+    private String departmentName;
+
+    @ApiModelProperty(value = "岗位id", name = "postId", required = true)
+    @NotNull(message = "岗位id不能为空")
+    private Long postId;
+
+    @ApiModelProperty(value = "岗位名称", name = "postName", required = true)
+    @NotEmpty(message = "岗位名称不能为空")
+    private String postName;
+
+    @ApiModelProperty(value = "入职状态，1-入职 0-离职", name = "employmentFlag", required = true)
+    @NotNull(message = "入职状态，1-入职 0-离职不能为空")
+    private Integer employmentFlag;
+
+}
+

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

@@ -0,0 +1,28 @@
+package com.zcloud.basic.info.dto;
+
+import com.alibaba.cola.dto.PageQuery;
+import lombok.Data;
+
+
+/**
+ * web-client
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Data
+public class UserEmploymentLogPageQry extends PageQuery {
+
+    /**
+     * 查询条件操作前缀,支持以下几种数据库查询操作：
+     * - `like`: 模糊匹配查询，对应SQL的LIKE操作符
+     * - `eq`: 等值查询，对应SQL的=操作符
+     * - `gt`: 大于比较查询
+     * - `lt`: 小于比较查询
+     * - `ge`: 大于等于比较查询
+     * - `le`: 小于等于比较查询
+     * - `ne`: 不等比较查询，对应SQL的!=操作符
+     */
+    private String likeUserEmploymentLogId;
+}
+

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

@@ -0,0 +1,18 @@
+package com.zcloud.basic.info.dto;
+
+import com.alibaba.cola.dto.PageQuery;
+import lombok.Data;
+
+
+/**
+ * web-client
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Data
+public class UserEmploymentLogQryCmd{
+
+    private String likeUserEmploymentLogId;
+}
+

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

@@ -0,0 +1,55 @@
+package com.zcloud.basic.info.dto;
+
+import com.alibaba.cola.dto.Command;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * web-client
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserEmploymentLogUpdateCmd extends Command {
+    @ApiModelProperty(value = "主键", name = "id", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+    @ApiModelProperty(value = "业务主键id", name = "userEmploymentLogId", required = true)
+    @NotEmpty(message = "业务主键id不能为空")
+    private String userEmploymentLogId;
+    @ApiModelProperty(value = "用户id", name = "userId", required = true)
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+    @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true)
+    @NotNull(message = "企业id不能为空")
+    private Long corpinfoId;
+    @ApiModelProperty(value = "企业名称", name = "corpinfoName", required = true)
+    @NotEmpty(message = "企业名称不能为空")
+    private String corpinfoName;
+    @ApiModelProperty(value = "部门id", name = "departmentId", required = true)
+    @NotNull(message = "部门id不能为空")
+    private Long departmentId;
+    @ApiModelProperty(value = "部门名称", name = "departmentName", required = true)
+    @NotEmpty(message = "部门名称不能为空")
+    private String departmentName;
+    @ApiModelProperty(value = "岗位id", name = "postId", required = true)
+    @NotNull(message = "岗位id不能为空")
+    private Long postId;
+    @ApiModelProperty(value = "岗位名称", name = "postName", required = true)
+    @NotEmpty(message = "岗位名称不能为空")
+    private String postName;
+    @ApiModelProperty(value = "入职状态，1-入职 0-离职", name = "employmentFlag", required = true)
+    @NotNull(message = "入职状态，1-入职 0-离职不能为空")
+    private Integer employmentFlag;
+}
+

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

@@ -63,10 +63,10 @@ public class UserUpdateCmd extends Command {
     private String locationAddress;
     @ApiModelProperty(value = "手机号", name = "phone")
     private String phone;
-    @ApiModelProperty(value = "职级", name = "rank")
+    @ApiModelProperty(value = "职级", name = "rankLevel")
-    private String rank;
+    private String rankLevel;
-    @ApiModelProperty(value = "职级名称", name = "rank_name")
+    @ApiModelProperty(value = "职级名称", name = "rankLevelName")
-    private String rank_name;
+    private String rankLevelName;
     @ApiModelProperty(value = "人员在部门中的排序", name = "sort")
     private Integer sort;
     @ApiModelProperty(value = "描述", name = "remarks")

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

@@ -88,10 +88,10 @@ public class UserXgfAddCmd extends Command {
     @ApiModelProperty(value = "户口所在地", name = "locationAddress", required = true)
     @NotEmpty(message = "户口所在地不能为空")
     private String locationAddress;
-    @ApiModelProperty(value = "职级", name = "rank")
+    @ApiModelProperty(value = "职级", name = "rankLevel")
-    private String rank;
+    private String rankLevel;
-    @ApiModelProperty(value = "职级名称", name = "rank_name")
+    @ApiModelProperty(value = "职级名称", name = "rankLevelName")
-    private String rank_name;
+    private String rankLevelName;
 
     @ApiModelProperty(value = "人员在部门中的排序", name = "sort")
     private Integer sort;

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

@@ -94,9 +94,9 @@ public class UserCO extends ClientObject {
     private String locationAddress;
 
     @ApiModelProperty(value = "职级")
-    private String rank;
+    private String rankLevel;
     @ApiModelProperty(value = "职级名称")
-    private String rank_name;
+    private String rankLevelName;
     @ApiModelProperty(value = "手机号")
     private String phone;
     //人员在部门中的排序

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

@@ -0,0 +1,83 @@
+package com.zcloud.basic.info.dto.clientobject;
+
+import com.alibaba.cola.dto.ClientObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * web-client
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Data
+public class UserEmploymentLogCO extends ClientObject {
+    //主键
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    //业务主键id
+    @ApiModelProperty(value = "业务主键id")
+    private String userEmploymentLogId;
+    //用户id
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+    //企业id
+    @ApiModelProperty(value = "企业id")
+    private Long corpinfoId;
+    //企业名称
+    @ApiModelProperty(value = "企业名称")
+    private String corpinfoName;
+    //部门id
+    @ApiModelProperty(value = "部门id")
+    private Long departmentId;
+    //部门名称
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+    //岗位id
+    @ApiModelProperty(value = "岗位id")
+    private Long postId;
+    //岗位名称
+    @ApiModelProperty(value = "岗位名称")
+    private String postName;
+    //入职状态，1-入职 0-离职
+    @ApiModelProperty(value = "入职状态，1-入职 0-离职")
+    private Integer employmentFlag;
+    //是否删除
+    @ApiModelProperty(value = "是否删除")
+    private String deleteEnum;
+    //租户id
+    @ApiModelProperty(value = "租户id")
+    private Long tenantId;
+    //组织id
+    @ApiModelProperty(value = "组织id")
+    private Long orgId;
+    //版本号
+    @ApiModelProperty(value = "版本号")
+    private Integer version;
+    //创建时间
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+    //修改时间
+    @ApiModelProperty(value = "修改时间")
+    private String updateTime;
+    //创建人id
+    @ApiModelProperty(value = "创建人id")
+    private Long createId;
+    //修改人id
+    @ApiModelProperty(value = "修改人id")
+    private Long updateId;
+    //创建人
+    @ApiModelProperty(value = "创建人")
+    private String createName;
+    //修改人
+    @ApiModelProperty(value = "修改人")
+    private String updateName;
+    //备注
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    //环境
+    @ApiModelProperty(value = "环境")
+    private String env;
+}
+

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

@@ -0,0 +1,31 @@
+package com.zcloud.basic.info.domain.gateway;
+
+
+import com.zcloud.basic.info.domain.model.UserEmploymentLogE;
+
+/**
+ * web-domain
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+public interface UserEmploymentLogGateway {
+
+    /**
+     * 新增
+     */
+    Boolean add(UserEmploymentLogE userEmploymentLogE);
+
+    /**
+     * 修改
+     */
+    Boolean update(UserEmploymentLogE userEmploymentLogE);
+
+    /**
+     * 删除
+     */
+    Boolean deletedUserEmploymentLogById(Long id);
+
+    Boolean deletedUserEmploymentLogByIds(Long[] id);
+}
+

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

@@ -59,10 +59,10 @@ public class UserE extends BaseE {
     //户口所在地
     private String locationAddress;
 
-    private String rank;
+    private String rankLevel;
     private String phone;
 
-    private String rank_name;
+    private String rankLevelName;
     //人员在部门中的排序
     private Integer sort;
     //乐观锁
@@ -115,6 +115,7 @@ public class UserE extends BaseE {
         userE.setUserId(Tools.get32UUID());
         userE.setTenantId(!ObjectUtils.isEmpty(userE.getTenantId())? userE.getTenantId() : tenantId);
         userE.setCorpinfoId(!ObjectUtils.isEmpty(userE.getCorpinfoId())? userE.getCorpinfoId() : tenantId);
+        userE.setEmploymentFlag(1);
     }
     public Response verifyUser(Long userCount) {
         if (userCount > 0) {

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

@@ -0,0 +1,66 @@
+package com.zcloud.basic.info.domain.model;
+
+import com.jjb.saas.framework.domain.model.BaseE;
+import com.zcloud.gbscommon.utils.Tools;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * web-domain
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Data
+public class UserEmploymentLogE extends BaseE {
+    //主键
+    private Long id;
+    //业务主键id
+    private String userEmploymentLogId;
+    //用户id
+    private Long userId;
+    //企业id
+    private Long corpinfoId;
+    //企业名称
+    private String corpinfoName;
+    //部门id
+    private Long departmentId;
+    //部门名称
+    private String departmentName;
+    //岗位id
+    private Long postId;
+    //岗位名称
+    private String postName;
+    //入职状态，1-入职 0-离职
+    private Integer employmentFlag;
+    //是否删除
+    private String deleteEnum;
+    //租户id
+    private Long tenantId;
+    //组织id
+    private Long orgId;
+    //版本号
+    private Integer version;
+    //创建时间
+    private LocalDateTime createTime;
+    //修改时间
+    private LocalDateTime updateTime;
+    //创建人id
+    private Long createId;
+    //修改人id
+    private Long updateId;
+    //创建人
+    private String createName;
+    //修改人
+    private String updateName;
+    //备注
+    private String remarks;
+    //环境
+    private String env;
+
+    public void initAdd(UserEmploymentLogE userEmploymentLogE) {
+        userEmploymentLogE.setUserEmploymentLogId(Tools.get32UUID());
+    }
+}
+

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

@@ -0,0 +1,50 @@
+package com.zcloud.basic.info.gatewayimpl;
+
+import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway;
+import com.zcloud.basic.info.domain.model.UserEmploymentLogE;
+import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO;
+import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+
+/**
+ * web-infrastructure
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Service
+@AllArgsConstructor
+public class UserEmploymentLogGatewayImpl implements UserEmploymentLogGateway {
+    private final UserEmploymentLogRepository userEmploymentLogRepository;
+
+    @Override
+    public Boolean add(UserEmploymentLogE userEmploymentLogE) {
+        UserEmploymentLogDO d = new UserEmploymentLogDO();
+        BeanUtils.copyProperties(userEmploymentLogE, d);
+        userEmploymentLogRepository.save(d);
+        return true;
+    }
+
+    @Override
+    public Boolean update(UserEmploymentLogE userEmploymentLogE) {
+        UserEmploymentLogDO d = new UserEmploymentLogDO();
+        BeanUtils.copyProperties(userEmploymentLogE, d);
+        userEmploymentLogRepository.updateById(d);
+        return true;
+    }
+
+    @Override
+    public Boolean deletedUserEmploymentLogById(Long id) {
+        return userEmploymentLogRepository.removeById(id);
+    }
+
+    @Override
+    public Boolean deletedUserEmploymentLogByIds(Long[] ids) {
+        return userEmploymentLogRepository.removeByIds(Collections.singletonList(ids));
+    }
+}
+

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java

@@ -89,9 +89,9 @@ public class UserDO extends BaseDO {
     @ApiModelProperty(value = "户口所在地")
     private String locationAddress;
     @ApiModelProperty(value = "职级")
-    private String rank;
+    private String rankLevel;
     @ApiModelProperty(value = "职级名称")
-    private String rank_name;
+    private String rankLevelName;
     @ApiModelProperty(value = "手机号")
     private String phone;
     //人员在部门中的排序

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java

@@ -0,0 +1,54 @@
+package com.zcloud.basic.info.persistence.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * web-infrastructure
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Data
+@TableName("user_employment_log")
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class UserEmploymentLogDO extends BaseDO {
+    //业务主键id
+    @ApiModelProperty(value = "业务主键id")
+    private String userEmploymentLogId;
+    //用户id
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+    //企业id
+    @ApiModelProperty(value = "企业id")
+    private Long corpinfoId;
+    //企业名称
+    @ApiModelProperty(value = "企业名称")
+    private String corpinfoName;
+    //部门id
+    @ApiModelProperty(value = "部门id")
+    private Long departmentId;
+    //部门名称
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+    //岗位id
+    @ApiModelProperty(value = "岗位id")
+    private Long postId;
+    //岗位名称
+    @ApiModelProperty(value = "岗位名称")
+    private String postName;
+    //入职状态，1-入职 0-离职
+    @ApiModelProperty(value = "入职状态，1-入职 0-离职")
+    private Integer employmentFlag;
+
+    public UserEmploymentLogDO(String userEmploymentLogId) {
+        this.userEmploymentLogId = userEmploymentLogId;
+    }
+
+}
+

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

@@ -0,0 +1,17 @@
+package com.zcloud.basic.info.persistence.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * web-infrastructure
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Mapper
+public interface UserEmploymentLogMapper extends BaseMapper<UserEmploymentLogDO> {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.zcloud.basic.info.persistence.repository;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.PageResponse;
+import com.jjb.saas.framework.repository.repo.BaseRepository;
+import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * web-infrastructure
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+public interface UserEmploymentLogRepository extends BaseRepository<UserEmploymentLogDO> {
+    PageResponse<UserEmploymentLogDO> listPage(Map<String, Object> params);
+    List<UserEmploymentLogDO> listAll(Map<String, Object> params);
+}
+

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

@@ -0,0 +1,50 @@
+package com.zcloud.basic.info.persistence.repository.impl;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.PageResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.repository.common.PageHelper;
+import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
+import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO;
+import com.zcloud.basic.info.persistence.mapper.UserEmploymentLogMapper;
+import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository;
+import com.zcloud.gbscommon.utils.PageQueryHelper;
+import com.zcloud.gbscommon.utils.Query;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * web-infrastructure
+ *
+ * @Author zhangyue
+ * @Date 2025-11-06 19:15:37
+ */
+@Service
+@RequiredArgsConstructor
+public class UserEmploymentLogRepositoryImpl extends BaseRepositoryImpl<UserEmploymentLogMapper, UserEmploymentLogDO> implements UserEmploymentLogRepository {
+    private final UserEmploymentLogMapper userEmploymentLogMapper;
+
+    @Override
+    public PageResponse<UserEmploymentLogDO> listPage(Map<String, Object> params) {
+        IPage<UserEmploymentLogDO> iPage = new Query<UserEmploymentLogDO>().getPage(params);
+        QueryWrapper<UserEmploymentLogDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
+        queryWrapper.orderByDesc("create_time");
+        IPage<UserEmploymentLogDO> result = userEmploymentLogMapper.selectPage(iPage, queryWrapper);
+        return PageHelper.pageToResponse(result, result.getRecords());
+    }
+
+    @Override
+    public List<UserEmploymentLogDO> listAll(Map<String, Object> params) {
+        QueryWrapper<UserEmploymentLogDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
+        queryWrapper.orderByDesc("create_time");
+        queryWrapper.eq("delete_enum","FALSE");
+        return userEmploymentLogMapper.selectList(queryWrapper);
+    }
+}
+

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

@@ -77,6 +77,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
 
     @Override
     public UserDO getInfoById(Long id) {
+        UserDO d = userMapper.getInfoById(id);
+        System.out.println("getInfoById");
         return userMapper.getInfoById(id);
     }
 

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

@@ -5,17 +5,17 @@
 <mapper namespace="com.zcloud.basic.info.persistence.mapper.UserMapper">
     <select id="selectListAll" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
         select
+        d.name as department_name,
+        p.post_name,
         u.id,
         u.user_id,
         u.username,
         u.name,
         u.corpinfo_id,
-        c.corp_name,
+        u.main_corp_flag,
         u.user_type,
         u.department_id,
-        d.name as department_name,
         u.post_id,
-        p.post_name,
         u.role_id,
         u.email,
         u.phone,
@@ -24,11 +24,33 @@
         u.nation,
         u.nation_name,
         u.user_id_card,
+        u.user_avatar_url,
+        u.current_address,
+        u.location_address,
+        u.rank_level,
+        u.rank_level_name,
+        u.sort,
+        u.version,
         u.create_id,
         u.create_name,
         u.create_time,
+        u.update_id,
+        u.update_name,
+        u.update_time,
+        u.remarks,
+        u.delete_enum,
         u.tenant_id,
         u.org_id,
+        u.env,
+        u.department_leader_flag,
+        u.deputy_leader_flag,
+        u.cultural_level,
+        u.cultural_level_name,
+        u.marital_status,
+        u.marital_status_name,
+        u.political_affiliation,
+        u.political_affiliation_name,
+        u.employment_flag,
         CASE
         WHEN MOD(SUBSTRING( u.user_id_card, 17, 1), 2) = 1 THEN '男'
         ELSE '女'
@@ -55,17 +77,17 @@
 
     <select id="selectUserPage" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
         select
+            d.name as department_name,
+            p.post_name,
             u.id,
             u.user_id,
             u.username,
             u.name,
             u.corpinfo_id,
-        c.corp_name,
+            u.main_corp_flag,
             u.user_type,
             u.department_id,
-        d.name as department_name,
             u.post_id,
-        p.post_name,
             u.role_id,
             u.email,
             u.phone,
@@ -74,11 +96,33 @@
             u.nation,
             u.nation_name,
             u.user_id_card,
+            u.user_avatar_url,
+            u.current_address,
+            u.location_address,
+            u.rank_level,
+            u.rank_level_name,
+            u.sort,
+            u.version,
             u.create_id,
             u.create_name,
             u.create_time,
+            u.update_id,
+            u.update_name,
+            u.update_time,
+            u.remarks,
+            u.delete_enum,
             u.tenant_id,
             u.org_id,
+            u.env,
+            u.department_leader_flag,
+            u.deputy_leader_flag,
+            u.cultural_level,
+            u.cultural_level_name,
+            u.marital_status,
+            u.marital_status_name,
+            u.political_affiliation,
+            u.political_affiliation_name,
+            u.employment_flag,
         CASE
             WHEN MOD(SUBSTRING( u.user_id_card, 17, 1), 2) = 1 THEN '男'
             ELSE '女'
@@ -114,6 +158,8 @@
         u.user_avatar_url,
         u.current_address,
         u.location_address,
+        u.rank_level,
+        u.rank_level_name,
         u.sort,
         u.version,
         u.create_id,
@@ -135,6 +181,7 @@
         u.marital_status_name,
         u.political_affiliation,
         u.political_affiliation_name,
+        u.employment_flag,
         CASE
         WHEN MOD(SUBSTRING( u.user_id_card, 17, 1), 2) = 1 THEN '男'
         ELSE '女'