合并框架更新

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";
     /**

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("获取当前登录用户租户码失败");

xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Department.java

@@ -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;
-
-/**
- * <p>
- * 机构
- * </p>
- *
- * @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;
-}

xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Post.java

@@ -1,38 +0,0 @@
-package com.xjrsoft.tenant.entity;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 岗位
- * </p>
- *
- * @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;
-}
-

xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Tenant.java

@@ -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;
-
-/**
- * <p>
- *
- * </p>
- *
- * @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;
-
-}

xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/User.java

@@ -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;
-
-/**
- * <p>
- * 用户
- * </p>
- *
- * @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;
-}

xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/mapper/CommonTenantMapper.java

@@ -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;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author tzx
- * @since 2023-08-14
- */
-@Mapper()
-public interface CommonTenantMapper extends BaseMapper<Tenant> {
-
-}

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;

xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml

@@ -25,11 +25,11 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.xjrsoft</groupId>
+<!--            <groupId>com.xjrsoft</groupId>-->
-            <artifactId>xjrsoft-service-system-api</artifactId>
+<!--            <artifactId>xjrsoft-service-system-api</artifactId>-->
-            <version>${xjrsoft.framework.version}</version>
+<!--            <version>${xjrsoft.framework.version}</version>-->
-        </dependency>
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.xjrsoft</groupId>
@@ -51,11 +51,11 @@
             <version>${justauth.version}</version>
         </dependency>
 
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.xjrsoft</groupId>
+<!--            <groupId>com.xjrsoft</groupId>-->
-            <artifactId>xjrsoft-common-tenant</artifactId>
+<!--            <artifactId>xjrsoft-common-tenant</artifactId>-->
-            <version>${xjrsoft.framework.version}</version>
+<!--            <version>${xjrsoft.framework.version}</version>-->
-        </dependency>
+<!--        </dependency>-->
 
     </dependencies>
 

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<User> getUserByIdsFeignSet(Set<String> userIds) {
+        return null;
+    }
 }

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<UserRoleRelation> list(UserRoleRelation userRoleRelation) {
+        return null;
+    }
 }

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<Menu> getAllMenuListFeign() {
         return null;
     }
+
+    @Override
+    public Menu getOne(Menu menu) {
+        return null;
+    }
+
+    @Override
+    public List<Menu> getList(Menu menu) {
+        return null;
+    }
 }