From d60c080ebc128d006e4dbf049e46ed191840f2a7 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Wed, 30 Aug 2023 18:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/course/AddCourse.vue            | 34 +++++++++++++------
 .../course/controller/SeCourseController.java | 25 +++++++++++++-
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/course/AddCourse.vue b/ant-design-vue-jeecg/src/views/course/AddCourse.vue
index 39efc11..564e518 100644
--- a/ant-design-vue-jeecg/src/views/course/AddCourse.vue
+++ b/ant-design-vue-jeecg/src/views/course/AddCourse.vue
@@ -256,7 +256,7 @@
           <a-form-item label="教研室" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-select-depart
               userSelect="teachingandoffice"
-              v-decorator="['teachingandoffice', { initialValue: '711ca4920cfc4d61923d87ae3b1cfa8c' }]"
+              v-model="model.teachingandoffice"
             />
             <!-- <j-select-depart
               userSelect="teachingandoffice"
@@ -270,6 +270,7 @@
         <a-col :span="8">
           <a-form-item label="审定人" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-select-user-by-dep
+              :multi="fs"
               :value="model.verifier"
               userSelect="verifier"
               v-model="model.verifier"
@@ -403,7 +404,7 @@
 </template>
 
 <script>
-import { httpAction } from '@/api/manage'
+import { httpAction,getAction } from '@/api/manage'
 //import { JeecgListMixin } from './JeecgListMixin.js'
 import pick from 'lodash.pick'
 import JTreeSelect from '@/components/jeecg/JTreeSelect'
@@ -444,10 +445,10 @@ export default {
         category: 1,
         cooperativeEducation: 0,
         semester: '1',
-        depid: '711ca4920cfc4d61923d87ae3b1cfa8c',
-        majorid: '1296639081827090434',
-        verifier: 'mladmin'
-
+        depid: '',
+        majorid: '',
+        verifier: '',
+        teachingandoffice:''
       },
 
       //修改
@@ -487,6 +488,7 @@ export default {
       url: {
         add: '/course/seCourse/add',
         edit: '/course/seCourse/edit',
+        dqyh: '/course/seCourse/dqyh',
       },
       //修改 表单验证  正则表达式
       validatorRules: {
@@ -623,11 +625,11 @@ export default {
         //   ],
         //   trigger: 'blur',
         // },
-        name: {//name与v-decorator中属性对应 
-          // initialValue: "水",//初始化值，也就是默认值      
-          rules: [{ required: true, message: '不能为空!' },//此处开启校验必填             
-          // { validator: (rule, value, callback) => validateDuplicateValue('em_project_info', 'project_name', value, this.model.id, callback) },//此处开启唯一验证，              
-          // { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!' },//此处配置正则表达式，手机号，可自己配置正则表达式   
+        name: {//name与v-decorator中属性对应
+          // initialValue: "水",//初始化值，也就是默认值
+          rules: [{ required: true, message: '不能为空!' },//此处开启校验必填
+          // { validator: (rule, value, callback) => validateDuplicateValue('em_project_info', 'project_name', value, this.model.id, callback) },//此处开启唯一验证，
+          // { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!' },//此处配置正则表达式，手机号，可自己配置正则表达式
           {
             // pattern: /^(([1]?\\d)|20)$/,
             pattern: /^[^\\]{0,100}$/,
@@ -638,6 +640,16 @@ export default {
     }
   },
   created () {
+    getAction(this.url.dqyh).then((res) => {
+      if (res.success) {
+        this.model.depid = res.result.depid;
+        this.model.teachingandoffice = res.result.teachingandoffice;
+        this.model.majorid = res.result.majorid;
+        this.model.verifier = res.result.verifier;
+      } else {
+
+      }
+    });
     let that = this
     that.$bus.$on('headleUser', ({ restle, userSelect }) => {
       if (restle && userSelect) that.$set(that.selectContent, userSelect, restle)
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/course/controller/SeCourseController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/course/controller/SeCourseController.java
index ac98961..466b316 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/course/controller/SeCourseController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/course/controller/SeCourseController.java
@@ -48,7 +48,10 @@ import org.jeecg.modules.py.entity.PyGraRequire;
 import org.jeecg.modules.py.service.BasicInfoService;
 import org.jeecg.modules.py.service.IPyGraRequireService;
 import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.teacherManage.entity.SeTeacherManage;
+import org.jeecg.modules.teacherManage.service.ISeTeacherManageService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.TemplateWordConstants;
@@ -132,6 +135,9 @@ public class SeCourseController extends JeecgController<SeCourse, ISeCourseServi
     @Autowired
     private BasicInfoService basicInfoService;
 
+    @Autowired
+    private ISeTeacherManageService seTeacherManageService;
+
 
     @Value("${jeecg.wordPath}")
     private String wordPath;
@@ -497,12 +503,29 @@ public class SeCourseController extends JeecgController<SeCourse, ISeCourseServi
         return Result.OK(sc);
     }
 
+    @AutoLog(value = "当前登录用户信息")
+    @ApiOperation(value = "当前登录用户信息", notes = "当前登录用户信息")
+    @GetMapping(value = "/dqyh")
+    public Result<?> dqyh(HttpServletRequest req) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        Map<String,String> map = new HashMap<>();
+        SeTeacherManage seTeacherManage = new SeTeacherManage();
+        QueryWrapper<SeTeacherManage> queryWrapper = QueryGenerator.initQueryWrapper(seTeacherManage, req.getParameterMap());
+        queryWrapper.eq("userid",user.getId());
+        List<SeTeacherManage> list = seTeacherManageService.list(queryWrapper);
+        map.put("depid",user.getDepartIds());
+        map.put("teachingandoffice",user.getDepartIds());
+        map.put("majorid",list.get(0).getProfession());
+        map.put("verifier",user.getUsername());
+        return Result.OK(map);
+    }
+
     @AutoLog(value = "考核目标-分页列表查询")
     @ApiOperation(value = "考核目标-分页列表查询", notes = "考核目标-分页列表查询")
     @GetMapping(value = "/getnrxz")
     public Result<?> getnrxz(@RequestParam(name = "id", required = true)String id) {
         SeCourse sc = seCourseService.getById(id);
-        return Result.ok(sc);
+        return Result.OK(sc);
     }