修改id 列名为u_id

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/SimpleAuthorizationSettingDetailEntity.java

@@ -24,6 +24,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.JsonCodec;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 import java.util.List;
@@ -73,4 +74,10 @@ public class SimpleAuthorizationSettingDetailEntity extends SimpleGenericEntity<
     @Column
     private Boolean                merge;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/SimpleAuthorizationSettingEntity.java

@@ -22,6 +22,7 @@ import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.List;
 
@@ -53,5 +54,11 @@ public class SimpleAuthorizationSettingEntity extends SimpleGenericEntity<String
 
     private List<AuthorizationSettingDetailEntity> details;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/SimpleAuthorizationSettingMenuEntity.java

@@ -23,6 +23,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 import java.util.List;
@@ -54,4 +55,10 @@ public class SimpleAuthorizationSettingMenuEntity extends SimpleTreeSortSupportE
 
     private List<AuthorizationSettingMenuEntity> children;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/SimpleMenuEntity.java

@@ -24,6 +24,7 @@ import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -80,4 +81,11 @@ public class SimpleMenuEntity extends SimpleTreeSortSupportEntity<String>
         }
         return target;
     }
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/SimplePermissionEntity.java

@@ -9,6 +9,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.JsonCodec;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 import java.util.ArrayList;
@@ -78,4 +79,11 @@ public class SimplePermissionEntity extends SimpleGenericEntity<String> implemen
         return target;
     }
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
+
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/SimpleRoleEntity.java

@@ -32,4 +32,12 @@ public class SimpleRoleEntity extends SimpleGenericEntity<String> implements Rol
     public SimpleRoleEntity clone() {
         return ((SimpleRoleEntity) super.clone());
     }
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
+
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/SimpleUserEntity.java

@@ -8,6 +8,7 @@ import org.hswebframework.web.bean.ToString;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
@@ -53,4 +54,11 @@ public class SimpleUserEntity extends SimpleGenericEntity<String> implements Use
     public SimpleUserEntity clone() {
         return ((SimpleUserEntity) super.clone());
     }
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/SimpleUserRoleEntity.java

@@ -32,4 +32,6 @@ public class SimpleUserRoleEntity implements UserRoleEntity {
     public SimpleUserRoleEntity clone() {
         return (SimpleUserRoleEntity)super.clone();
     }
+
+
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/UserMenuEntity.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import java.util.List;
 
 /**
@@ -37,4 +38,10 @@ public class UserMenuEntity extends SimpleTreeSortSupportEntity<String> {
 
     private List<UserMenuEntity> children;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/UserSettingEntity.java

@@ -11,6 +11,7 @@ import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 import org.hswebframework.web.validator.group.CreateGroup;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 import java.util.Date;
@@ -69,4 +70,11 @@ public class UserSettingEntity extends SimpleGenericEntity<String> {
         return permission.in(permissions);
 
     }
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java

@@ -79,6 +79,10 @@ public class SimpleAuthorizationSettingService extends GenericEntityService<Auth
     @Autowired
     private SyncRepository<AuthorizationSettingDetailEntity, String> authorizationSettingDetailDao;
 
+    @Autowired
+    private SyncRepository<AuthorizationSettingMenuEntity, String> menuEntityStringSyncRepository;
+
+
     private AuthorizationSettingMenuService authorizationSettingMenuService;
 
     private MenuService menuService;
@@ -104,9 +108,17 @@ public class SimpleAuthorizationSettingService extends GenericEntityService<Auth
         return createQuery().where(AuthorizationSettingEntity.type, type)
                 .and(AuthorizationSettingEntity.settingFor, settingFor)
                 .fetchOne()
+                .map(entity -> {
+                    entity.setDetails(authorizationSettingDetailDao.createQuery()
+                            .where(AuthorizationSettingDetailEntity::getSettingId, entity.getId()).fetch());
+                    entity.setMenus(menuEntityStringSyncRepository.createQuery()
+                            .where(AuthorizationSettingMenuEntity::getSettingId, entity.getId()).fetch());
+                    return entity;
+                })
                 .orElse(null);
     }
 
+
     @Override
     @CacheEvict(cacheNames = {CacheConstants.USER_AUTH_CACHE_NAME, CacheConstants.USER_MENU_CACHE_NAME}, allEntries = true)
     public String saveOrUpdate(AuthorizationSettingEntity entity) {

hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/src/main/java/org/hswebframework/web/dashboard/entity/DashBoardConfigEntity.java

@@ -9,6 +9,7 @@ import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 import org.hswebframework.web.validator.group.CreateGroup;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import java.sql.JDBCType;
@@ -69,4 +70,11 @@ public class DashBoardConfigEntity extends SimpleGenericEntity<String> implement
         }
         return Long.compare(sortIndex, o.sortIndex);
     }
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/src/main/java/org/hswebframework/web/entity/datasource/SimpleDataSourceConfigEntity.java

@@ -2,9 +2,11 @@ package org.hswebframework.web.entity.datasource;
 
 import lombok.*;
 import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
+import org.hswebframework.ezorm.rdb.mapping.annotation.JsonCodec;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 import java.util.Map;
@@ -39,8 +41,16 @@ public class SimpleDataSourceConfigEntity extends SimpleGenericEntity<String> im
 
     @Override
     @Column
-    @ColumnType(jdbcType = JDBCType.CLOB)
+    @ColumnType(jdbcType = JDBCType.LONGNVARCHAR)
+    @JsonCodec
     public Map<String, Object> getProperties() {
         return super.getProperties();
     }
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/src/main/java/org/hswebframework/web/dictionary/api/entity/SimpleDictionaryEntity.java

@@ -16,9 +16,12 @@
  */
 package org.hswebframework.web.dictionary.api.entity;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.List;
 
@@ -28,6 +31,8 @@ import java.util.List;
  * @author hsweb-generator-online
  */
 @Table(name = "s_dictionary")
+@Getter
+@Setter
 public class SimpleDictionaryEntity extends SimpleGenericEntity<String> implements DictionaryEntity {
     //字典名称
     @Column
@@ -51,109 +56,11 @@ public class SimpleDictionaryEntity extends SimpleGenericEntity<String> implemen
     //字段选项
     private List<DictionaryItemEntity> items;
 
-    /**
-     * @return 字典名称
-     */
     @Override
-    public String getName() {
-        return this.name;
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
     }
 
-    /**
-     * 设置 字典名称
-     */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * @return 分类id
-     */
-    @Override
-    public String getClassifiedId() {
-        return this.classifiedId;
-    }
-
-    /**
-     * 设置 分类id
-     */
-    @Override
-    public void setClassifiedId(String classifiedId) {
-        this.classifiedId = classifiedId;
-    }
-
-    /**
-     * @return 说明
-     */
-    @Override
-    public String getDescribe() {
-        return this.describe;
-    }
-
-    /**
-     * 设置 说明
-     */
-    @Override
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-
-    /**
-     * @return 创建时间
-     */
-    @Override
-    public Long getCreateTime() {
-        return this.createTime;
-    }
-
-    /**
-     * 设置 创建时间
-     */
-    @Override
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * @return 创建人id
-     */
-    @Override
-    public String getCreatorId() {
-        return this.creatorId;
-    }
-
-    /**
-     * 设置 创建人id
-     */
-    @Override
-    public void setCreatorId(String creatorId) {
-        this.creatorId = creatorId;
-    }
-
-    /**
-     * @return 状态
-     */
-    @Override
-    public Byte getStatus() {
-        return this.status;
-    }
-
-    /**
-     * 设置 状态
-     */
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    @Override
-    public List<DictionaryItemEntity> getItems() {
-        return items;
-    }
-
-    @Override
-    public void setItems(List<DictionaryItemEntity> items) {
-        this.items = items;
-    }
 }

hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/src/main/java/org/hswebframework/web/dictionary/api/entity/SimpleDictionaryItemEntity.java

@@ -25,6 +25,7 @@ import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 import org.hswebframework.web.validator.group.CreateGroup;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.List;
 
@@ -87,4 +88,11 @@ public class SimpleDictionaryItemEntity extends SimpleTreeSortSupportEntity<Stri
         jsonObject.put("describe", getDescribe());
         return jsonObject;
     }
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/entity/form/SimpleDynamicFormColumnEntity.java

@@ -7,6 +7,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.JsonCodec;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 import java.util.List;
@@ -64,4 +65,11 @@ public class SimpleDynamicFormColumnEntity extends SimpleGenericEntity<String> i
     @ColumnType(jdbcType = JDBCType.CLOB)
     @JsonCodec
     private List<String> validator;
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/entity/form/SimpleDynamicFormDeployLogEntity.java

@@ -1,9 +1,12 @@
 package org.hswebframework.web.entity.form;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 
@@ -13,6 +16,8 @@ import java.sql.JDBCType;
  * @author hsweb-generator-online
  */
 @Table(name = "s_dyn_form_log")
+@Getter
+@Setter
 public class SimpleDynamicFormDeployLogEntity extends SimpleGenericEntity<String> implements DynamicFormDeployLogEntity {
     //表单ID
     @Column(name = "form_id", length = 32)
@@ -31,77 +36,10 @@ public class SimpleDynamicFormDeployLogEntity extends SimpleGenericEntity<String
     @Column
     private Byte status;
 
-    /**
-     * @return 表单ID
-     */
     @Override
-    public String getFormId() {
-        return this.formId;
-    }
-
-    /**
-     * @param formId 表单ID
-     */
-    @Override
-    public void setFormId(String formId) {
-        this.formId = formId;
-    }
-
-    /**
-     * @return 发布的版本
-     */
-    @Override
-    public Long getVersion() {
-        return this.version;
-    }
-
-    /**
-     * @param version 发布的版本
-     */
-    @Override
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-    /**
-     * @return 发布时间
-     */
-    @Override
-    public Long getDeployTime() {
-        return this.deployTime;
-    }
-
-    /**
-     * @param deployTime 发布时间
-     */
-    @Override
-    public void setDeployTime(Long deployTime) {
-        this.deployTime = deployTime;
-    }
-
-    /**
-     * @return 部署的元数据
-     */
-    @Override
-    public String getMetaData() {
-        return this.metaData;
-    }
-
-    /**
-     * @param metaData 部署的元数据
-     */
-    @Override
-    public void setMetaData(String metaData) {
-        this.metaData = metaData;
-    }
-
-    @Override
-    public Byte getStatus() {
-        return status;
-    }
-
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
     }
 }

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/entity/form/SimpleDynamicFormEntity.java

@@ -6,6 +6,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 
@@ -66,5 +67,11 @@ public class SimpleDynamicFormEntity extends SimpleGenericEntity<String> impleme
     @Column(length = 1024)
     private String tags;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 
 }

hsweb-system/hsweb-system-file/hsweb-system-file-api/src/main/java/org/hswebframework/web/entity/file/SimpleFileInfoEntity.java

@@ -4,6 +4,7 @@ import lombok.*;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
@@ -49,4 +50,10 @@ public class SimpleFileInfoEntity extends SimpleGenericEntity<String> implements
     @Column(name = "creator_id")
     private String creatorId;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/src/main/java/org/hswebframework/web/entity/oauth2/client/SimpleOAuth2ServerConfigEntity.java

@@ -16,9 +16,12 @@
  */
 package org.hswebframework.web.entity.oauth2.client;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
@@ -27,6 +30,8 @@ import javax.persistence.Table;
  * @author hsweb-generator-online
  */
 @Table(name = "s_oauth2_server")
+@Getter
+@Setter
 public class SimpleOAuth2ServerConfigEntity extends SimpleGenericEntity<String> implements OAuth2ServerConfigEntity {
     //服务名称
     @Column
@@ -61,150 +66,9 @@ public class SimpleOAuth2ServerConfigEntity extends SimpleGenericEntity<String>
     private String provider;
 
     @Override
-    public String getProvider() {
-        return provider;
-    }
-
-    @Override
-    public void setProvider(String provider) {
-        this.provider = provider;
-    }
-
-    @Override
-    public String getRedirectUri() {
-        return redirectUri;
-    }
-
-    @Override
-    public void setRedirectUri(String redirectUri) {
-        this.redirectUri = redirectUri;
-    }
-
-    /**
-     * @return 服务名称
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * 设置 服务名称
-     */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * @return 备注
-     */
-    @Override
-    public String getDescribe() {
-        return this.describe;
-    }
-
-    /**
-     * 设置 备注
-     */
-    @Override
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-
-    /**
-     * @return api根地址
-     */
-    @Override
-    public String getApiBaseUrl() {
-        return this.apiBaseUrl;
-    }
-
-    /**
-     * 设置 api根地址
-     */
-    @Override
-    public void setApiBaseUrl(String apiBaseUrl) {
-        this.apiBaseUrl = apiBaseUrl;
-    }
-
-    /**
-     * @return 认证地址
-     */
-    @Override
-    public String getAuthUrl() {
-        return this.authUrl;
-    }
-
-    /**
-     * 设置 认证地址
-     */
-    @Override
-    public void setAuthUrl(String authUrl) {
-        this.authUrl = authUrl;
-    }
-
-    /**
-     * @return token获取地址
-     */
-    @Override
-    public String getAccessTokenUrl() {
-        return this.accessTokenUrl;
-    }
-
-    /**
-     * 设置 token获取地址
-     */
-    @Override
-    public void setAccessTokenUrl(String accessTokenUrl) {
-        this.accessTokenUrl = accessTokenUrl;
-    }
-
-    /**
-     * @return 客户端id
-     */
-    @Override
-    public String getClientId() {
-        return this.clientId;
-    }
-
-    /**
-     * 设置 客户端id
-     */
-    @Override
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    /**
-     * @return 客户端密钥
-     */
-    @Override
-    public String getClientSecret() {
-        return this.clientSecret;
-    }
-
-    /**
-     * 设置 客户端密钥
-     */
-    @Override
-    public void setClientSecret(String clientSecret) {
-        this.clientSecret = clientSecret;
-    }
-
-    /**
-     * @return 是否启用
-     */
-    @Override
-    public Byte getStatus() {
-        return this.status;
-    }
-
-    /**
-     * 设置 是否启用
-     */
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
     }
 }

hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/src/main/java/org/hswebframework/web/entity/oauth2/client/SimpleOAuth2UserTokenEntity.java

@@ -16,10 +16,13 @@
  */
 package org.hswebframework.web.entity.oauth2.client;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 
@@ -29,6 +32,8 @@ import java.sql.JDBCType;
  * @author hsweb-generator-online
  */
 @Table(name = "s_oauth2_user_token")
+@Getter
+@Setter
 public class SimpleOAuth2UserTokenEntity extends SimpleGenericEntity<String> implements OAuth2UserTokenEntity {
     //客户端用户id
     @Column(name = "client_user_id", length = 128)
@@ -66,172 +71,9 @@ public class SimpleOAuth2UserTokenEntity extends SimpleGenericEntity<String> imp
     private String grantType;
 
     @Override
-    public String getGrantType() {
-        return grantType;
-    }
-
-    @Override
-    public void setGrantType(String grantType) {
-        this.grantType = grantType;
-    }
-
-    /**
-     * @return 客户端用户id
-     */
-    @Override
-    public String getClientUserId() {
-        return this.clientUserId;
-    }
-
-    /**
-     * 设置 客户端用户id
-     */
-    @Override
-    public void setClientUserId(String clientUserId) {
-        this.clientUserId = clientUserId;
-    }
-
-    /**
-     * @return 服务端用户id
-     */
-    @Override
-    public String getServerUserId() {
-        return this.serverUserId;
-    }
-
-    /**
-     * 设置 服务端用户id
-     */
-    @Override
-    public void setServerUserId(String serverUserId) {
-        this.serverUserId = serverUserId;
-    }
-
-    /**
-     * @return 服务端id
-     */
-    @Override
-    public String getServerId() {
-        return this.serverId;
-    }
-
-    /**
-     * 设置 服务端id
-     */
-    @Override
-    public void setServerId(String serverId) {
-        this.serverId = serverId;
-    }
-
-    /**
-     * @return 客户端id
-     */
-    @Override
-    public String getClientId() {
-        return this.clientId;
-    }
-
-    /**
-     * 设置 客户端id
-     */
-    @Override
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    /**
-     * @return 授权码
-     */
-    @Override
-    public String getAccessToken() {
-        return this.accessToken;
-    }
-
-    /**
-     * 设置 授权码
-     */
-    @Override
-    public void setAccessToken(String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-    /**
-     * @return 更新码
-     */
-    @Override
-    public String getRefreshToken() {
-        return this.refreshToken;
-    }
-
-    /**
-     * 设置 更新码
-     */
-    @Override
-    public void setRefreshToken(String refreshToken) {
-        this.refreshToken = refreshToken;
-    }
-
-    /**
-     * @return 有效期
-     */
-    @Override
-    public Integer getExpiresIn() {
-        return this.expiresIn;
-    }
-
-    /**
-     * 设置 有效期
-     */
-    @Override
-    public void setExpiresIn(Integer expiresIn) {
-        this.expiresIn = expiresIn;
-    }
-
-    /**
-     * @return 授权范围
-     */
-    @Override
-    public String getScope() {
-        return this.scope;
-    }
-
-    /**
-     * 设置 授权范围
-     */
-    @Override
-    public void setScope(String scope) {
-        this.scope = scope;
-    }
-
-    /**
-     * @return 创建时间
-     */
-    @Override
-    public Long getCreateTime() {
-        return this.createTime;
-    }
-
-    /**
-     * 设置 创建时间
-     */
-    @Override
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * @return 更新时间
-     */
-    @Override
-    public Long getUpdateTime() {
-        return this.updateTime;
-    }
-
-    /**
-     * 设置 更新时间
-     */
-    @Override
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
     }
 }

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/src/main/java/org/hswebframework/web/entity/oauth2/server/SimpleAuthorizationCodeEntity.java

@@ -60,4 +60,5 @@ public class SimpleAuthorizationCodeEntity implements AuthorizationCodeEntity {
     private String redirectUri;
 
 
+
 }

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/src/main/java/org/hswebframework/web/entity/oauth2/server/SimpleOAuth2ClientEntity.java

@@ -23,6 +23,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 import java.util.Set;
@@ -38,7 +39,12 @@ import java.util.Set;
 @Table(name = "s_oauth2_client")
 public class SimpleOAuth2ClientEntity extends SimpleGenericEntity<String> implements OAuth2ClientEntity {
     private static final long serialVersionUID = -8370400980996896599L;
-
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
     @Column
     private String name;
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/src/main/java/org/hswebframework/web/entity/organizational/SimpleDepartmentEntity.java

@@ -20,6 +20,7 @@ import lombok.*;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import java.util.List;
@@ -53,5 +54,10 @@ public class SimpleDepartmentEntity extends SimpleTreeSortSupportEntity<String>
     private Byte status;
 
     private List<DepartmentEntity> children;
-
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/src/main/java/org/hswebframework/web/entity/organizational/SimpleDistrictEntity.java

@@ -4,6 +4,7 @@ import lombok.*;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import java.util.List;
@@ -47,5 +48,10 @@ public class SimpleDistrictEntity extends SimpleTreeSortSupportEntity<String> im
     private Byte status;
 
     private List<DistrictEntity> children;
-
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/src/main/java/org/hswebframework/web/entity/organizational/SimpleOrganizationalEntity.java

@@ -23,6 +23,7 @@ import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import java.util.List;
@@ -63,5 +64,10 @@ public class SimpleOrganizationalEntity extends SimpleTreeSortSupportEntity<Stri
 
     //子级组织
     private List<OrganizationalEntity> children;
-
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/src/main/java/org/hswebframework/web/entity/organizational/SimplePersonAuthBindEntity.java

@@ -1,33 +1,18 @@
 package org.hswebframework.web.entity.organizational;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.Set;
 
 /**
  * @author zhouhao
  */
-
+@Getter
+@Setter
 public class SimplePersonAuthBindEntity extends SimplePersonEntity implements PersonAuthBindEntity {
     private PersonUserEntity personUser;
     //职务ID集合
     private Set<String>      positionIds;
 
-    @Override
-    public PersonUserEntity getPersonUser() {
-        return personUser;
-    }
-
-    @Override
-    public void setPersonUser(PersonUserEntity personUser) {
-        this.personUser = personUser;
-    }
-
-    @Override
-    public Set<String> getPositionIds() {
-        return positionIds;
-    }
-
-    @Override
-    public void setPositionIds(Set<String> positionIds) {
-        this.positionIds = positionIds;
-    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/src/main/java/org/hswebframework/web/entity/organizational/SimplePersonEntity.java

@@ -25,6 +25,7 @@ import org.hibernate.validator.constraints.NotBlank;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
@@ -69,5 +70,10 @@ public class SimplePersonEntity extends SimpleGenericEntity<String> implements P
     @Column
     private String remark;
 
-
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/src/main/java/org/hswebframework/web/entity/organizational/SimplePositionEntity.java

@@ -23,6 +23,7 @@ import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import java.util.List;
@@ -55,4 +56,10 @@ public class SimplePositionEntity extends SimpleTreeSortSupportEntity<String> im
 
     private List<PositionEntity> children;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/src/main/java/org/hswebframework/web/entity/organizational/SimpleRelationDefineEntity.java

@@ -7,6 +7,7 @@ import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
@@ -31,4 +32,11 @@ public class SimpleRelationDefineEntity extends SimpleGenericEntity<String> impl
     //状态
     @Column
     private Byte status;
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/src/main/java/org/hswebframework/web/entity/organizational/SimpleRelationInfoEntity.java

@@ -7,6 +7,7 @@ import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
@@ -39,4 +40,11 @@ public class SimpleRelationInfoEntity extends SimpleGenericEntity<String> implem
     //状态
     @Column
     private Byte status;
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/UserInSqlTerm.java

@@ -63,6 +63,7 @@ public abstract class UserInSqlTerm<PK> extends AbstractSqlTermCustomizer {
         boolean parent = term.getOptions().contains("parent");
 
         if (!child && !parent) {
+            fragments.addSql(table);
             super.appendCondition(fragments, column, values);
         } else {
             List<String> paths = getTreePathByTerm(values)

hsweb-system/hsweb-system-script/hsweb-system-script-api/src/main/java/org/hswebframework/web/entity/script/SimpleScriptEntity.java

@@ -1,9 +1,12 @@
 package org.hswebframework.web.entity.script;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 
@@ -13,6 +16,8 @@ import java.sql.JDBCType;
  * @author hsweb-generator-online
  */
 @Table(name = "s_script")
+@Getter
+@Setter
 public class SimpleScriptEntity extends SimpleGenericEntity<String> implements ScriptEntity {
     //脚本名称
     @Column
@@ -37,115 +42,11 @@ public class SimpleScriptEntity extends SimpleGenericEntity<String> implements S
     @Column
     private String tag;
 
-    /**
-     * @return 脚本名称
-     */
     @Override
-    public String getName() {
-        return this.name;
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
     }
 
-    /**
-     * @param name 脚本名称
-     */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * @return 类型
-     */
-    @Override
-    public String getType() {
-        return this.type;
-    }
-
-    /**
-     * @param type 类型
-     */
-    @Override
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * @return 脚本内容
-     */
-    @Override
-    public String getScript() {
-        return this.script;
-    }
-
-    /**
-     * @param script 脚本内容
-     */
-    @Override
-    public void setScript(String script) {
-        this.script = script;
-    }
-
-    /**
-     * @return 脚本语言
-     */
-    @Override
-    public String getLanguage() {
-        return this.language;
-    }
-
-    /**
-     * @param language 脚本语言
-     */
-    @Override
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    /**
-     * @return 备注
-     */
-    @Override
-    public String getRemark() {
-        return this.remark;
-    }
-
-    /**
-     * @param remark 备注
-     */
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    /**
-     * @return 状态
-     */
-    @Override
-    public Long getStatus() {
-        return this.status;
-    }
-
-    /**
-     * @param status 状态
-     */
-    @Override
-    public void setStatus(Long status) {
-        this.status = status;
-    }
-
-    /**
-     * @return 脚本标签
-     */
-    @Override
-    public String getTag() {
-        return this.tag;
-    }
-
-    /**
-     * @param tag 脚本标签
-     */
-    @Override
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
 }

hsweb-system/hsweb-system-template/hsweb-system-template-api/src/main/java/org/hswebframework/web/entity/template/SimpleTemplateEntity.java

@@ -6,6 +6,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.sql.JDBCType;
 
@@ -44,5 +45,11 @@ public class SimpleTemplateEntity extends SimpleGenericEntity<String> implements
     @Column
     private String classified;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 
 }

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/dao/entity/ActivityConfigEntity.java

@@ -9,13 +9,13 @@ import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 import org.hswebframework.web.validator.group.CreateGroup;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import java.sql.JDBCType;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Getter
 @Setter
@@ -77,4 +77,10 @@ public class ActivityConfigEntity extends SimpleGenericEntity<String> {
     @JsonCodec
     private List<ListenerConfig> listeners;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/dao/entity/ProcessDefineConfigEntity.java

@@ -9,6 +9,7 @@ import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 import org.hswebframework.web.validator.group.CreateGroup;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
@@ -71,4 +72,10 @@ public class ProcessDefineConfigEntity extends SimpleGenericEntity<String> {
     @ColumnType(jdbcType = JDBCType.LONGVARCHAR)
     private List<ListenerConfig> listeners;
 
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/dao/entity/ProcessHistoryEntity.java

@@ -7,6 +7,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.JsonCodec;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import java.sql.JDBCType;
@@ -73,4 +74,11 @@ public class ProcessHistoryEntity extends SimpleGenericEntity<String> {
 
     @Column(name = "task_name")
     private String taskName;
+
+    @Override
+    @Id
+    @Column(name = "u_id")
+    public String getId() {
+        return super.getId();
+    }
 }