Merge branch 'dev' into 'test'

Dev

See merge request jygk/dsc!23

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/dept/DeptApiImpl.java

@@ -4,6 +4,8 @@ import com.zt.plat.framework.common.enums.CommonStatusEnum;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.CompanyDeptInfo;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.CompanyDataPermissionIgnore;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.system.api.dept.dto.*;
 import com.zt.plat.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import com.zt.plat.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
@@ -78,6 +80,8 @@ public class DeptApiImpl implements DeptApi {
     }
 
     @Override
+    @CompanyDataPermissionIgnore
+    @DeptDataPermissionIgnore
     public CommonResult<DeptRespDTO> getDept(Long id) {
         DeptDO dept = deptService.getDept(id);
         return success(BeanUtils.toBean(dept, DeptRespDTO.class));

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java

@@ -798,7 +798,12 @@ public class IWorkSyncProcessorImpl implements IWorkSyncProcessor {
         if (StrUtil.isBlank(statusFlag)) {
             return false;
         }
-        return !"0".equals(statusFlag.trim());
+        Integer status = parseInteger(statusFlag);
+        if (status == null) {
+            return false;
+        }
+        // iWork 状态：0试用、1正式、2临时、3试用延期、4解聘、5离职、6退休、7无效
+        return status >= 4;
     }
 
     private Integer resolveSex(String sexFlag) {

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncServiceImpl.java

@@ -260,10 +260,10 @@ public class IWorkSyncServiceImpl implements IWorkSyncService {
         if (query == null || reqVO == null) {
             return;
         }
+        copyQueryParameters(reqVO, query); // 设置查询条件
         if (StrUtil.isBlank(reqVO.getId())) {
             return;
         }
-        copyQueryParameters(reqVO, query); // 设置查询条件
         applyQueryId(query, reqVO.getId());
     }