diff --git a/client/src/views/dtsjygl/dtsjk.vue b/client/src/views/dtsjygl/dtsjk.vue index ebd4495..4d4a2c5 100644 --- a/client/src/views/dtsjygl/dtsjk.vue +++ b/client/src/views/dtsjygl/dtsjk.vue @@ -112,13 +112,8 @@ const state = reactive({ rules: { industryType: [{ required: true, message: '监管行业不能为空', trigger: 'blur' }], unitName: [{ required: true, message: '生产经营单位名称不能为空', trigger: 'blur' }], - shortName: [{ required: true, message: '单位简称不能为空', trigger: 'blur' }], - unifiedSocialCode: [{ required: true, message: '社会统一信用代码不能为空', trigger: 'blur' }], - businessStatus: [{ required: true, message: '营业状态不能为空', trigger: 'blur' }], - orgCode: [{ required: false, message: '所属机构不能为空', trigger: 'blur' }], - legalRepresentative: [{ required: true, message: '法定代表人(经营者)姓名不能为空', trigger: 'blur' }], - contactPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }], - agency: [{ required: true, message: '属地不能为空', trigger: 'blur' }], + + uired: true, message: '属地不能为空', trigger: 'blur' }], legalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }], legalDuty: [{ required: true, message: '法定代表人(经营者)职位不能为空', trigger: 'blur' }], regulatedIndustry: [{ required: true, message: '国民经济行业分类不能为空', trigger: 'blur' }], diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java index 2814068..19f799c 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java @@ -22,14 +22,7 @@ import java.util.List; @Table(name = "zf_zfzbgl") @Data public class Zfzbgl extends BaseModel { - /** - * ID(ULID) - */ - @Id - @Column(name = "zfzbglid", length = 26) - @GeneratedValue(generator = Constants.Genernators.gen_ulid) - @Comment("ID(ULID)") - private String zfzbglid; + /** * 所属机构ID diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java index e77ac06..3cf71ac 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java @@ -37,6 +37,8 @@ public class ZsfzglService { return zsfzglRepository.findAll(buildQueryCondition(query)); } + + public Page page(ZsfzglQuery query, RemoteUserInfo user) { Integer _psize = Optional.ofNullable(query.pageSize()).filter(f -> f > 0).orElse(20); Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0);