b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、车船模块fix bug

Browse Source 
2、运力模块fix bug
3、新增设备台账
4、其他bug 修复
5、调整组织、人员模块
This commit is contained in:
b2894lxlx
2026-08-07 08:27:47 +08:00
parent a1eea5075b
commit f716b3fc63
107 changed files with 2269 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java
View File

@@ -25,6 +25,7 @@
*/
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -35,6 +36,7 @@ import org.springblade.system.pojo.context.IPhone;
import java.io.Serial;
import java.util.Date;
import java.util.List;
/**
* 实体类
@@ -133,6 +135,27 @@ public class User extends TenantEntity implements IPhone {
* 是否推送mk
*/
private Integer isPushMk;
/**
* 备注
*/
private String remark;
/**
* OA 人员 ID（由用户部门关联表聚合查询返回）
*/
@TableField(exist = false)
private String oaPersonId;
/** 人员类别：1-内部员工，2-承运商 */
private Integer personCategory;
/** 数据权限范围：1-仅所属组织，2-全部组织，3-自定义 */
private Integer dataScopeRange;
/** 数据层级范围：1-包含下级，2-仅本级 */
private Integer dataLevelRange;
/** 是否包含新增客商 */
private Integer includeNewCustomer;
@TableField(exist = false)
private List<Long> dataScopeDeptIds;
@TableField(exist = false)
private List<Long> customerIds;
}

15
blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/UserCustomerScope.java Normal file
View File

@@ -0,0 +1,15 @@
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName("blade_user_customer_scope")
public class UserCustomerScope {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
private Long userId;
private Long customerId;
}

15
blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/UserDataScope.java Normal file
View File

@@ -0,0 +1,15 @@
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName("blade_user_data_scope")
public class UserDataScope {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
private Long userId;
private Long deptId;
}