diff --git a/ljwx-admin/src/views/customer/config/modules/customer-config-operate-drawer.vue b/ljwx-admin/src/views/customer/config/modules/customer-config-operate-drawer.vue index 34860e7..904aa84 100644 --- a/ljwx-admin/src/views/customer/config/modules/customer-config-operate-drawer.vue +++ b/ljwx-admin/src/views/customer/config/modules/customer-config-operate-drawer.vue @@ -277,7 +277,7 @@ function beforeUpload(data: { file: UploadFileInfo; fileList: UploadFileInfo[] } - + diff --git a/ljwx-admin/src/views/manage/position/index.vue b/ljwx-admin/src/views/manage/position/index.vue index 223b4a9..255caf4 100644 --- a/ljwx-admin/src/views/manage/position/index.vue +++ b/ljwx-admin/src/views/manage/position/index.vue @@ -37,8 +37,7 @@ const { columns, columnChecks, data, loading, getData, getDataByPage, mobilePagi name: null, status: null, orgId: customerId, - // 非admin用户只查看自己租户的岗位 - customerId: isAdmin.value ? null : customerId + customerId: customerId }, columns: () => [ { diff --git a/ljwx-admin/src/views/manage/position/modules/position-operate-drawer.vue b/ljwx-admin/src/views/manage/position/modules/position-operate-drawer.vue index 54ff3ac..439cbbb 100644 --- a/ljwx-admin/src/views/manage/position/modules/position-operate-drawer.vue +++ b/ljwx-admin/src/views/manage/position/modules/position-operate-drawer.vue @@ -58,10 +58,10 @@ function createDefaultModel(): Model { description: '', sort: 1, status: '1', - orgId: Number(props.customerId), + orgId: props.customerId, weight: 1.0, - // 非admin用户创建的岗位自动关联到当前租户 - customerId: props.isAdmin ? null : Number(props.customerId) + // 所有岗位都关联到当前租户 + customerId: props.customerId }; } console.log('orgId', model.orgId); @@ -89,8 +89,25 @@ function closeDrawer() { async function handleSubmit() { await validate(); + + // 新增时不发送id字段,编辑时需要id + const submitData = isEdit.value ? model : { ...model }; + if (!isEdit.value) { + delete (submitData as any).id; + } + + // 确保ID字段为字符串格式,避免精度丢失 + if (submitData.orgId) { + submitData.orgId = String(submitData.orgId); + } + if (submitData.customerId) { + submitData.customerId = String(submitData.customerId); + } + + console.log('提交数据:', JSON.stringify(submitData, null, 2)); + const func = isEdit.value ? fetchUpdatePosition : fetchAddPosition; - const { error, data } = await func(model); + const { error, data } = await func(submitData); if (!error && data) { window.$message?.success(isEdit.value ? $t('common.updateSuccess') : $t('common.addSuccess')); closeDrawer(); diff --git a/ljwx-bigscreen/bigscreen/config.py b/ljwx-bigscreen/bigscreen/config.py index ff0c3e0..b48c568 100644 --- a/ljwx-bigscreen/bigscreen/config.py +++ b/ljwx-bigscreen/bigscreen/config.py @@ -13,7 +13,7 @@ MYSQL_HOST = os.getenv('MYSQL_HOST', 'ljwx-mysql') #统一使用ljwx-mysql MYSQL_PORT = int(os.getenv('MYSQL_PORT', 3306)) MYSQL_USER = os.getenv('MYSQL_USER', 'root') MYSQL_PASSWORD = os.getenv('MYSQL_PASSWORD', 'Ljwx2024!@#') #正确密码 -MYSQL_DATABASE = os.getenv('MYSQL_DATABASE', 'lj-06') #正确数据库名 +MYSQL_DATABASE = os.getenv('MYSQL_DATABASE', 'ljwx') #正确数据库名 # Redis configuration REDIS_HOST = os.getenv('REDIS_HOST', 'ljwx-redis') #统一使用ljwx-redis diff --git a/ljwx-bigscreen/config.py b/ljwx-bigscreen/config.py index 25f2015..909468c 100644 --- a/ljwx-bigscreen/config.py +++ b/ljwx-bigscreen/config.py @@ -13,7 +13,7 @@ MYSQL_HOST = os.getenv('MYSQL_HOST', 'mysql' if IS_DOCKER else '127.0.0.1') MYSQL_PORT = int(os.getenv('MYSQL_PORT', 3306)) MYSQL_USER = os.getenv('MYSQL_USER', 'root') MYSQL_PASSWORD = os.getenv('MYSQL_PASSWORD', '123456') -MYSQL_DATABASE = os.getenv('MYSQL_DATABASE', 'lj-06') +MYSQL_DATABASE = os.getenv('MYSQL_DATABASE', 'ljwx') # Redis configuration REDIS_HOST = os.getenv('REDIS_HOST', 'redis' if IS_DOCKER else '127.0.0.1') diff --git a/ljwx-boot/ljwx-boot-admin/src/main/resources/application-local.yml b/ljwx-boot/ljwx-boot-admin/src/main/resources/application-local.yml index b2e16e2..53656e4 100644 --- a/ljwx-boot/ljwx-boot-admin/src/main/resources/application-local.yml +++ b/ljwx-boot/ljwx-boot-admin/src/main/resources/application-local.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/${MYSQL_DATABASE:lj-06}?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true&failOverReadOnly=false&maxReconnects=3&initialTimeout=2&connectTimeout=60000&socketTimeout=60000 + url: jdbc:mysql://localhost:3306/${MYSQL_DATABASE:ljwx}?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true&failOverReadOnly=false&maxReconnects=3&initialTimeout=2&connectTimeout=60000&socketTimeout=60000 username: ${MYSQL_USER:root} password: ${MYSQL_PASSWORD:123456} hikari: #本地开发连接池优化 @@ -150,7 +150,7 @@ ljwx: # 为DruidConfiguration兼容性添加标准Spring Boot数据源配置 spring: datasource: - url: jdbc:mysql://localhost:3306/${MYSQL_DATABASE:lj-06}?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true&failOverReadOnly=false&maxReconnects=3&initialTimeout=2&connectTimeout=60000&socketTimeout=60000 + url: jdbc:mysql://localhost:3306/${MYSQL_DATABASE:ljwx}?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true&failOverReadOnly=false&maxReconnects=3&initialTimeout=2&connectTimeout=60000&socketTimeout=60000 username: ${MYSQL_USER:root} password: ${MYSQL_PASSWORD:123456} driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/position/SysPositionAddDTO.java b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/position/SysPositionAddDTO.java index d785923..cc3628f 100644 --- a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/position/SysPositionAddDTO.java +++ b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/position/SysPositionAddDTO.java @@ -48,4 +48,7 @@ public class SysPositionAddDTO implements Serializable { @Schema(description = "权重") private BigDecimal weight; + + @Schema(description = "租户ID") + private Long customerId; } \ No newline at end of file diff --git a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/position/SysPositionUpdateDTO.java b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/position/SysPositionUpdateDTO.java index 35fe69d..4185994 100644 --- a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/position/SysPositionUpdateDTO.java +++ b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/position/SysPositionUpdateDTO.java @@ -51,4 +51,7 @@ public class SysPositionUpdateDTO implements Serializable { @Schema(description = "权重") private BigDecimal weight; + + @Schema(description = "租户ID") + private Long customerId; } \ No newline at end of file diff --git a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/role/SysRoleAddDTO.java b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/role/SysRoleAddDTO.java index 8764abf..6d82852 100644 --- a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/role/SysRoleAddDTO.java +++ b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/role/SysRoleAddDTO.java @@ -40,4 +40,7 @@ public class SysRoleAddDTO implements Serializable { @Schema(description = "是否为管理员角色(0:普通角色,1:管理员角色)") private Integer isAdmin; + + @Schema(description = "租户ID") + private Long customerId; } \ No newline at end of file diff --git a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/role/SysRoleUpdateDTO.java b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/role/SysRoleUpdateDTO.java index c50deab..d8e23e2 100644 --- a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/role/SysRoleUpdateDTO.java +++ b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/domain/dto/role/SysRoleUpdateDTO.java @@ -43,4 +43,7 @@ public class SysRoleUpdateDTO implements Serializable { @Schema(description = "是否为管理员角色(0:普通角色,1:管理员角色)") private Integer isAdmin; + + @Schema(description = "租户ID") + private Long customerId; } \ No newline at end of file diff --git a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/repository/mapper/SysPositionMapper.xml b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/repository/mapper/SysPositionMapper.xml index 72939ae..5ccda01 100644 --- a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/repository/mapper/SysPositionMapper.xml +++ b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/repository/mapper/SysPositionMapper.xml @@ -39,6 +39,7 @@ + @@ -58,7 +59,8 @@ status, weight, is_deleted, - org_id + org_id, + customer_id diff --git a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/repository/mapper/SysRoleMapper.xml b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/repository/mapper/SysRoleMapper.xml index ef53661..b3ae5cd 100644 --- a/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/repository/mapper/SysRoleMapper.xml +++ b/ljwx-boot/ljwx-boot-modules/src/main/java/com/ljwx/modules/system/repository/mapper/SysRoleMapper.xml @@ -19,6 +19,7 @@ + @@ -32,7 +33,7 @@ update_user_id, update_time, is_deleted, - parent_id, role_name, role_code, description, sort, status, is_admin + parent_id, role_name, role_code, description, sort, status, is_admin, customer_id