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

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

@@ -27,11 +27,6 @@ public class PostListQry {
      * - `ne`: 不等比较查询，对应SQL的!=操作符
      */
 
-    @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag", required = true)
-    @NotNull(message = "监管端/企业端标识不能为空")
-    // 监管端/企业端标识,1-监管端, 2-企业端
-    private Integer corpFlag;
-
     @ApiModelProperty(value = "主键id集合", name = "postIds")
     // 主键id集合
     private Long[] postIds;

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

@@ -28,10 +28,6 @@ public class PostPageQry extends PageQuery {
      * - `ne`: 不等比较查询，对应SQL的!=操作符
      */
 
-    @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag", required = true)
-    @NotNull(message = "监管端/企业端标识不能为空")
-    // 监管端/企业端标识,1-监管端, 2-企业端
-    private Integer corpFlag;
 
     @ApiModelProperty(value = "部门id", name = "eqDepartmentId", required = true)
     @NotNull(message = "部门id不能为空")

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

@@ -93,6 +93,7 @@ public class UserAddCmd extends Command {
     @ApiModelProperty(value = "描述", name = "remarks")
     private String remarks;
     @ApiModelProperty(value = "是否部门领导0否1是", name = "departmentLeaderFlag")
+    @NotNull(message = "是否部门领导不能为空")
     private Integer departmentLeaderFlag;
 
     @ApiModelProperty(value = "是否分管领导0否1是", name = "deputyLeaderFlag")

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

@@ -1,6 +1,7 @@
 package com.zcloud.basic.info.persistence.repository.impl;
 
 import com.alibaba.cola.dto.MultiResponse;
+import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
@@ -35,11 +36,15 @@ public class PostRepositoryImpl extends BaseRepositoryImpl<PostMapper, PostDO> i
     @Override
     public PageResponse<PostDO> listPage(Map<String, Object> params) {
 
-        // 企业端
+        if(params.get("eqCorpinfoId") == null){
-        Integer corpFlag = (Integer)params.get("corpFlag");
-        if(corpFlag == 2){
             params.put("eqCorpinfoId", AuthContext.getTenantId());
         }
+        if(params.get("eqDepartmentId") != null){
+            Long eqDepartmentId = (Long) params.get("eqDepartmentId");
+            if(eqDepartmentId == 0){
+                params.put("eqDepartmentId", null);
+            }
+        }
 
         IPage<PostDO> iPage = new Query<PostDO>().getPage(params);
         QueryWrapper<PostDO> queryWrapper = new QueryWrapper<>();
@@ -52,10 +57,8 @@ public class PostRepositoryImpl extends BaseRepositoryImpl<PostMapper, PostDO> i
     @Override
     public MultiResponse<PostDO> list(Map<String, Object> params) {
 
-        // 企业端
+        if(params.get("eqCorpinfoId") == null){
-        Integer corpFlag = (Integer)params.get("corpFlag");
+            params.put("eqCorpinfoId", AuthContext.getTenantId());
-        if(corpFlag == 2){
-            params.put("corpinfoId", AuthContext.getTenantId());
         }
 
         Long[] ids = (Long[])params.get("postIds");