From 690c81fff39ab20fc934cd8847d7d1d18c918807 Mon Sep 17 00:00:00 2001 From: admin <417727563@qq.com> Date: Mon, 29 Jul 2024 11:17:41 +0800 Subject: [PATCH] =?UTF-8?q?29-=E4=BF=AE=E6=94=B9=2001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/demo/topic/controller/TopicController.java | 9 ++++++--- .../modules/system/controller/SysUserController.java | 7 +++++++ .../src/views/annualcomp/uncommitted/AnnualComp.data.ts | 5 ++++- jeecgboot-vue3-master/src/views/comp/Comp.data.ts | 4 ++-- .../src/views/scorepersion/ScorePersionList.vue | 2 +- .../src/views/scorestapoint/ScoreStaPointList.vue | 2 +- .../src/views/scorestapointd/ScoreStaPointDList.vue | 2 +- jeecgboot-vue3-master/src/views/topic/Topic.data.ts | 6 +++--- 8 files changed, 25 insertions(+), 12 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java index e2e7136c..4d7315dd 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java @@ -335,9 +335,12 @@ public class TopicController extends JeecgController { QueryWrapper queryWrapper= new QueryWrapper<>(); queryWrapper.eq("annual_compid",topic.getAnnualCompid()).eq("number",topic.getNumber()); Topic one = topicService.getOne(queryWrapper); - if (!Objects.equals(one.getId(), topic.getId())){ - return Result.error("编码重复"); - } + if(one!=null){ + if (!Objects.equals(one.getId(), topic.getId())){ + return Result.error("编码重复"); + } + } + topicService.updateById(topic); return Result.OK("编辑成功!"); } diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 87d2159e..1af4c42d 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -247,6 +247,13 @@ public class SysUserController { // 保存用户走一个service 保证事务 //获取租户ids String relTenantIds = jsonObject.getString("relTenantIds"); + SysUser sysUser = sysUserService.getUserByPhone(user.getPhone()); + if (sysUser != null) { + result.setMessage("该手机号已注册"); + result.setSuccess(false); + return result; + } + sysUserService.saveUser(user, selectedRoles, selectedDeparts, relTenantIds); baseCommonService.addLog("添加用户，username： " +user.getUsername() ,CommonConstant.LOG_TYPE_2, 2); result.success("添加成功！"); diff --git a/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualComp.data.ts b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualComp.data.ts index cb41ba10..bf2523d5 100644 --- a/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualComp.data.ts +++ b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualComp.data.ts @@ -149,9 +149,12 @@ export const formSchema: FormSchema[] = [ }, { - label: '驳回信息', + label: '反馈信息', field: 'backinfo', component: 'InputTextArea', + dynamicDisabled: ({ values }) => { + return !!values.id; + }, }, // TODO 主键隐藏字段，目前写死为ID { diff --git a/jeecgboot-vue3-master/src/views/comp/Comp.data.ts b/jeecgboot-vue3-master/src/views/comp/Comp.data.ts index 4d4ed48e..ae747eb7 100644 --- a/jeecgboot-vue3-master/src/views/comp/Comp.data.ts +++ b/jeecgboot-vue3-master/src/views/comp/Comp.data.ts @@ -30,12 +30,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'compImg', customRender: render.renderImage, }, - { +/* { title: '比赛详情', align: 'center', dataIndex: 'compDetail', slots: { customRender: 'htmlSlot' }, - }, + },*/ { title: '比赛介绍文件', align: 'center', diff --git a/jeecgboot-vue3-master/src/views/scorepersion/ScorePersionList.vue b/jeecgboot-vue3-master/src/views/scorepersion/ScorePersionList.vue index efafe706..9e3584ee 100644 --- a/jeecgboot-vue3-master/src/views/scorepersion/ScorePersionList.vue +++ b/jeecgboot-vue3-master/src/views/scorepersion/ScorePersionList.vue @@ -105,7 +105,7 @@ canResize:false, useSearchForm: false, actionColumn: { - width: 120, + width: 160, fixed: 'right', }, beforeFetch: (params) => { diff --git a/jeecgboot-vue3-master/src/views/scorestapoint/ScoreStaPointList.vue b/jeecgboot-vue3-master/src/views/scorestapoint/ScoreStaPointList.vue index c45df8f8..9e4427e0 100644 --- a/jeecgboot-vue3-master/src/views/scorestapoint/ScoreStaPointList.vue +++ b/jeecgboot-vue3-master/src/views/scorestapoint/ScoreStaPointList.vue @@ -73,7 +73,7 @@ canResize:false, useSearchForm: false, actionColumn: { - width: 120, + width: 160, fixed: 'right', }, beforeFetch: (params) => { diff --git a/jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue b/jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue index 7839e487..e82904da 100644 --- a/jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue +++ b/jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue @@ -78,7 +78,7 @@ canResize:false, useSearchForm: false, actionColumn: { - width: 120, + width: 160, fixed: 'right', }, beforeFetch: (params) => { diff --git a/jeecgboot-vue3-master/src/views/topic/Topic.data.ts b/jeecgboot-vue3-master/src/views/topic/Topic.data.ts index 32ffc75c..4584789c 100644 --- a/jeecgboot-vue3-master/src/views/topic/Topic.data.ts +++ b/jeecgboot-vue3-master/src/views/topic/Topic.data.ts @@ -70,11 +70,11 @@ export const formSchema: FormSchema[] = [ multi:true } }, - dynamicRules: ({model,schema}) => { +/* dynamicRules: ({model,schema}) => { return [ - { required: true, message: '请输入年度比赛项目id!'}, + { required: true, message: '请选择年度比赛项目!'}, ]; - }, + },*/ }, { label: '题目编号',