diff --git a/script/nacos_config_export_20240202135701.zip b/script/nacos_config_export_20240202135701.zip
new file mode 100644
index 0000000..e0e56da
Binary files /dev/null and b/script/nacos_config_export_20240202135701.zip differ
diff --git a/xjrsoft-common/xjrsoft-common-core/src/main/java/com/xjrsoft/common/core/constant/GlobalConstant.java b/xjrsoft-common/xjrsoft-common-core/src/main/java/com/xjrsoft/common/core/constant/GlobalConstant.java
index 082c89f..c92f6ca 100644
--- a/xjrsoft-common/xjrsoft-common-core/src/main/java/com/xjrsoft/common/core/constant/GlobalConstant.java
+++ b/xjrsoft-common/xjrsoft-common-core/src/main/java/com/xjrsoft/common/core/constant/GlobalConstant.java
@@ -737,6 +737,16 @@ public interface GlobalConstant {
*/
String DingtalkAccessTokenKey = "DINGTALK_ACCTSS_TOKEN";
+ /**
+ * Excel导出字段必填标识
+ */
+ String EXPORT_REQUIRED_SUFFIX = "(*)";
+
+ /**
+ * Excel导出字段必填高亮标识
+ */
+ String EXPORT_REQUIRED_HIGHLIGHT_STRING = "*";
+
String siteRootDepartmentKey="siteRootDepartment";
String companyTypeFilterKey="companyTypeFilter";
/**
diff --git a/xjrsoft-common/xjrsoft-common-mybatis/src/main/java/com/xjrsoft/common/mybatis/MybatisplusAutoConfiguration.java b/xjrsoft-common/xjrsoft-common-mybatis/src/main/java/com/xjrsoft/common/mybatis/MybatisplusAutoConfiguration.java
index 3c4bea3..2023d70 100644
--- a/xjrsoft-common/xjrsoft-common-mybatis/src/main/java/com/xjrsoft/common/mybatis/MybatisplusAutoConfiguration.java
+++ b/xjrsoft-common/xjrsoft-common-mybatis/src/main/java/com/xjrsoft/common/mybatis/MybatisplusAutoConfiguration.java
@@ -86,7 +86,8 @@ public class MybatisplusAutoConfiguration implements WebMvcConfigurer {
return null;
}
try {
- return new LongValue(SecureUtil.getTenantId());
+ //return new LongValue(SecureUtil.getTenantId());
+ return new LongValue(null);
}
catch (Exception e) {
log.error("获取当前登录用户租户码失败");
diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Department.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Department.java
deleted file mode 100644
index ede1b85..0000000
--- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Department.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.xjrsoft.tenant.entity;
-
-import com.xjrsoft.common.core.domain.base.AuditEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- *
- * 机构
- *
- *
- * @author tzx
- * @since 2022-03-02
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class Department extends AuditEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Long id;
-
- private String name;
-
- private Long parentId;
-
- private String code;
-
- private String mobile;
-
- private String email;
-
- private String website;
-
- private String address;
-
- private Integer sortCode;
-
- private String remark;
-
- private String hierarchy;
-
- private Integer departmentType;
-
- private Long tenantId;
-
- private String shortName;
-
- private Long departmentNature;
-
- private LocalDateTime establishedTime;
-
- private Long custodian;
-
- private String facsimile;
-
- private Long administrativeLeader;
-
- private Long partyCommitteeLeader;
-
- private String departmentLeaders;
-
- private String chargeOfLeaders;
-
- private String departmentLabel;
-
- private String extensionNumber;
-
- private Long industry;
-
- private String corporateLegalPerson;
-
- private String phoneNumber;
-
- private String contactNumber;
-
- private String depositBank;
-
- private String bankAccount;
-
- private String businessScope;
-
- private Long wechatDeptId;
-
- private Long dingtalkDeptId;
-
- private String dingAgentId;
-
- private String dingAppKey;
-
- private String dingAppSecret;
-}
diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Post.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Post.java
deleted file mode 100644
index 840f335..0000000
--- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Post.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.xjrsoft.tenant.entity;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- *
- * 岗位
- *
- *
- * @author tzx
- * @since 2022-03-02
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class Post implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Long id;
-
- private String name;
-
- private String code;
-
- private Long parentId;
-
- private Integer sortCode;
-
- private String remark;
-
- private Long deptId;
-
- private Long tenantId;
-}
-
diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Tenant.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Tenant.java
deleted file mode 100644
index 8e0aa84..0000000
--- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Tenant.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.xjrsoft.tenant.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.xjrsoft.common.core.domain.base.AuditEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- *
- *
- *
- *
- * @author tzx
- * @since 2023-08-14
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("xjr_tenant")
-public class Tenant extends AuditEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Long id;
-
- private String code;
-
- private String name;
-
- private LocalDateTime startTime;
-
- private LocalDateTime endTime;
-
- private String remark;
-
- private Integer sortCode;
-
-}
diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/User.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/User.java
deleted file mode 100644
index 981908d..0000000
--- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/User.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.xjrsoft.tenant.entity;
-
-import com.xjrsoft.common.core.domain.base.AuditEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- *
- * 用户
- *
- *
- * @author tzx
- * @since 2022-03-02
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class User extends AuditEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Long id;
-
- private String userName;
-
- private String name;
-
- private String code;
-
- private String nickName;
-
- private String password;
-
- private Integer gender;
-
- private String mobile;
-
- private Long postId;
-
- private String avatar;
-
- private String email;
-
- private String address;
-
- private Double longitude;
-
- private Double latitude;
-
- private Integer sortCode;
-
- private String remark;
-
- private Long departmentId;
-
- private String wechatNumber;
-
- private String qqNumber;
-
- private LocalDateTime birthDate;
-
- private Long tenantId;
-
- private String tenantCode;
-
- private Integer passwordAuthentication;
-
- private String phoneNumber;
-
- private String identityCardNumber;
-
- private Long politicsStatus;
-
- private Long administrativePost;
-
- private Long administrativeRank;
-
- private Long secretLevel;
-
- private Long professionalTitleGrade;
-
- private Long technicalPosition;
-
- private Long managerialPosition;
-
- private Long vocationalSkill;
-
- private String bindIp;
-}
diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/mapper/CommonTenantMapper.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/mapper/CommonTenantMapper.java
deleted file mode 100644
index 74bccf2..0000000
--- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/mapper/CommonTenantMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.xjrsoft.tenant.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xjrsoft.tenant.entity.Tenant;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author tzx
- * @since 2023-08-14
- */
-@Mapper()
-public interface CommonTenantMapper extends BaseMapper {
-
-}
diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/util/SecureUtil.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/util/SecureUtil.java
index 7094510..22c57f1 100644
--- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/util/SecureUtil.java
+++ b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/util/SecureUtil.java
@@ -5,7 +5,7 @@ import cn.dev33.satoken.stp.StpUtil;
import com.xjrsoft.common.core.constant.GlobalConstant;
import com.xjrsoft.organization.entity.Post;
import com.xjrsoft.organization.entity.User;
-import com.xjrsoft.tenant.entity.Department;
+import com.xjrsoft.organization.entity.Department;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml b/xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml
index 74948a9..1611b64 100644
--- a/xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml
+++ b/xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml
@@ -25,11 +25,11 @@
hutool-all
-
- com.xjrsoft
- xjrsoft-service-system-api
- ${xjrsoft.framework.version}
-
+
+
+
+
+
com.xjrsoft
@@ -51,11 +51,11 @@
${justauth.version}
-
- com.xjrsoft
- xjrsoft-common-tenant
- ${xjrsoft.framework.version}
-
+
+
+
+
+
diff --git a/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserClientFallBack.java b/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserClientFallBack.java
index a955cba..7fa1461 100644
--- a/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserClientFallBack.java
+++ b/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserClientFallBack.java
@@ -7,6 +7,7 @@ import com.xjrsoft.organization.vo.UserRoleVo;
import org.springframework.stereotype.Component;
import java.util.List;
+import java.util.Set;
/**
* @Author: tzx
@@ -68,4 +69,9 @@ public class UserClientFallBack implements IUserClient {
public User getUserByCodeFeign(String code) {
return null;
}
+
+ @Override
+ public List getUserByIdsFeignSet(Set userIds) {
+ return null;
+ }
}
diff --git a/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserRoleRelationClientFallBack.java b/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserRoleRelationClientFallBack.java
index 4dfef6f..fa87f9f 100644
--- a/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserRoleRelationClientFallBack.java
+++ b/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserRoleRelationClientFallBack.java
@@ -27,4 +27,9 @@ public class UserRoleRelationClientFallBack implements IUserRoleRelationClient {
public boolean addUserRoleRelationFeign(UserRoleRelation userRoleRelation) {
return false;
}
+
+ @Override
+ public List list(UserRoleRelation userRoleRelation) {
+ return null;
+ }
}
diff --git a/xjrsoft-service-api/xjrsoft-service-system-api/src/main/java/com/xjrsoft/system/fallback/MenuClientFallBack.java b/xjrsoft-service-api/xjrsoft-service-system-api/src/main/java/com/xjrsoft/system/fallback/MenuClientFallBack.java
index d5cb5e2..d233c47 100644
--- a/xjrsoft-service-api/xjrsoft-service-system-api/src/main/java/com/xjrsoft/system/fallback/MenuClientFallBack.java
+++ b/xjrsoft-service-api/xjrsoft-service-system-api/src/main/java/com/xjrsoft/system/fallback/MenuClientFallBack.java
@@ -61,4 +61,14 @@ public class MenuClientFallBack implements IMenuClient {
public List