Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java

@@ -340,13 +340,12 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 			 expert.setExpYjfx(expYjfx);//研究方向
 			 expert.setExpCsgz(expCsgz);//从事工作
 			 expertService.save(expert);
-			/*
 			 CompExp compExp = new CompExp();
 			 compExp.setCompid(compid);
 			 compExp.setCompName(compName);
 			 compExp.setExpid(expert.getId());
 			 compExp.setStat(stat);
-			 compExpService.save(compExp);*/
+			 compExpService.save(compExp);
 			 result.success("添加成功！");
 		 } catch (Exception e) {
 			 log.error(e.getMessage(), e);
@@ -408,7 +407,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 				 expert.setExpCsgz(expCsgz);//从事工作
 
 				 expertService.updateById(expert);
-				/* CompExp compExp = new CompExp();
+				 CompExp compExp = new CompExp();
 				 QueryWrapper<CompExp> queryWrapper1 = QueryGenerator.initQueryWrapper(compExp, req.getParameterMap());
 				 queryWrapper1.eq("expid",expert.getId());
 				 List<CompExp> listce = compExpService.list(queryWrapper1);
@@ -417,7 +416,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 				 compExp.setCompName(compName);
 				 compExp.setExpid(expert.getId());
 				 compExp.setStat(stat);
-				 compExpService.updateById(compExp);*/
+				 compExpService.updateById(compExp);
 				 result.success("修改成功!");
 			 }
 		 } catch (Exception e) {

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<Topic, ITopicService> {
         QueryWrapper<Topic> 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("编辑成功!");
     }

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("添加成功！");

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
   {

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',

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) => {

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) => {

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) => {

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: '题目编号',