zuhu管理完善

src/main/java/com/rj/controller/TenantController.java

@@ -91,6 +91,7 @@ public class TenantController {
     public ResponseEntity<Map<String, Object>> addTenant(
             @Parameter(description = "租户信息", required = true)
             @RequestBody Tenant tenant) {
+        tenant.setTenantCode("TENANT_ID_"+tenant.getTenantCode());
         tenant.setId(tenant.getTenantCode());
         Map<String, Object> result = tenantService.addTenant(tenant);
         Boolean success = (Boolean) result.get("success");

src/main/java/com/rj/entity/sys/User.java

@@ -72,9 +72,14 @@ public class User implements Serializable {
     private String scenarioItem;
 
     @Schema(description = "主角色")
-    @TableField("role")
+    @TableField("role_name")
     private String role;
 
+    @Schema(description = "主角色")
+    @TableField("role_name")
+    private String roleName;
+
+
     @Schema(description = "创建时间")
     @TableField("create_time")
     private LocalDateTime createTime;

src/main/java/com/rj/service/impl/TenantServiceImpl.java

@@ -168,8 +168,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
             }
 
             // 生成UUID作为主键
-            tenant.setId(UUID.randomUUID().toString().replace("-", ""));
-            tenant.setCreateTime(LocalDateTime.now());
+            tenant.setId(tenant.getTenantCode());
             tenant.setUpdateTime(LocalDateTime.now());
 
             // 设置默认状态为启用

src/main/java/com/rj/service/sys/impl/UserServiceImpl.java

@@ -56,7 +56,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         loginResponse.setToken(token);
         loginResponse.setLoginTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         loginResponse.setTenantId(user.getTenantId());
-        loginResponse.setRoleName(user.getRole());
+        loginResponse.setRoleName(user.getRoleName());
         loginResponse.setScenario(user.getScenario());
 
         return loginResponse;