添加授权范围

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java

@@ -554,6 +554,7 @@ public class LwKhclController extends JeecgController<LwKhcl, ILwKhclService> {
 		String sfjx = "0";
 		String inBynf = "";
 		String inSsyxmc = "";
+		String inZydl = "";
 		if(zjSqxx!=null){
 			Date date = new Date();
 			if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){
@@ -570,6 +571,10 @@ public class LwKhclController extends JeecgController<LwKhcl, ILwKhclService> {
 				inSsyxmc = zjSqxx.getKkdw();
 				lwKhcl.setInSsyxmc(inSsyxmc);
 			}
+			if(StringUtils.isNotBlank(zjSqxx.getZydl())){
+				inZydl = zjSqxx.getZydl();
+				lwKhcl.setInZydl(inZydl);
+			}
 		}
 		if(StringUtils.equals("1",sfjx)){
 			return Result.error("您未在授权期限内，不能进行查询！");

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java

@@ -128,5 +128,8 @@ public class LwKhcl implements Serializable {
     private String inSsyxmc;
     @TableField(exist = false)
     private String bylwCjPar;
+    @TableField(exist = false)
+    private String inZydl;
+
 
 }

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml

@@ -167,6 +167,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="lwKhcl.inZydl != null and lwKhcl.inZydl != ''">
+                and a.ssxnzymc in
+                <foreach item="item" index="index" collection="lwKhcl.inZydl.split(',')"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
 
             <if test='lwKhcl.lwzg != null and lwKhcl.lwzg == 1'>
                 and a.lwzg is not null

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java

@@ -186,7 +186,24 @@ public class ZjSqxxController extends JeecgController<ZjSqxx, IZjSqxxService> {
 	  */
 	 @PostMapping(value = "/addNew")
 	 public Result<String> addNew(@RequestBody ZjSqxx zjSqxx) {
-		 zjSqxxService.addNew(zjSqxx);
+
+
+		 QueryWrapper<ZjSqxx> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.eq("user_id",zjSqxx.getUserId());
+
+		 List<ZjSqxx> sqDataList = zjSqxx.getSqDataList();
+		 String sqfw = "";
+		 if(sqDataList.size()>0){
+			 sqfw = sqDataList.get(0).getSqfw();
+		 }else{
+			 return Result.error("请选择授权范围！");
+		 }
+		 queryWrapper.eq("sqfw",sqfw);
+		 if(zjSqxxService.getOne(queryWrapper)!=null){
+			 return Result.error("该用户已存在此授权信息，请查询后修改！");
+		 } else {
+			 zjSqxxService.save(zjSqxx);
+		 }
 		 return Result.OK("添加成功！");
 	 }
 

jeecgboot-vue3/.env

@@ -11,7 +11,7 @@ VITE_GLOB_APP_SHORT_NAME = 智慧教学服务中心
 VITE_GLOB_APP_CAS_BASE_URL=https://authserver.nenu.edu.cn/authserver
 
 # 是否开启单点登录
-VITE_GLOB_APP_OPEN_SSO = false
+VITE_GLOB_APP_OPEN_SSO = true
 
 # 开启微前端模式
 VITE_GLOB_APP_OPEN_QIANKUN=true

jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsZjList.vue

@@ -126,7 +126,7 @@
         width: 260,
       },
       beforeFetch: async (params) => {
-        params.column = 'status,createTime',params.order = 'desc';
+        params.column = 'zxsj,status',params.order = 'desc';
         return Object.assign(params, queryParam);
       },
     },

jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue

@@ -151,6 +151,11 @@
                     <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择所属院系名称，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
+                <a-col :span="24">
+                  <a-form-item label="校内专业" id="ZjSqxxForm-zydl" name="zydl">
+                    <JSelectMultiple v-model:value="formData.zydl" placeholder="请选择校内专业，如果不选，默认全部" :dictCode="`v_zhuanye,dept_name,dept_name`"></JSelectMultiple>
+                  </a-form-item>
+                </a-col>
                 <!-- <a-col :span="24">
                   <a-form-item label="所属校内专业（大类）名称" v-bind="validateInfos.zydl" id="ZjSqxxForm-zydl" name="zydl">
                     <a-input v-model:value="formData.zydl" placeholder="请输入所属校内专业（大类）名称" allow-clear></a-input>

jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue

@@ -155,11 +155,11 @@
                     <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择所属院系名称，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
-                <!-- <a-col :span="24">
+                <a-col :span="24">
-                  <a-form-item label="所属校内专业（大类）名称" v-bind="validateInfos.zydl" id="ZjSqxxForm-zydl" name="zydl">
+                  <a-form-item label="校内专业" id="ZjSqxxForm-zydl" name="zydl">
-                    <a-input v-model:value="item.zydl" placeholder="请输入所属校内专业（大类）名称" allow-clear></a-input>
+                    <JSelectMultiple v-model:value="item.zydl" placeholder="请选择校内专业，如果不选，默认全部" :dictCode="`v_zhuanye,dept_name,dept_name`"></JSelectMultiple>
                   </a-form-item>
-                </a-col> -->
+                </a-col>
                 <!-- <a-col :span="24">
                   <a-form-item label="毕业论文（设计）类别" id="ZjSqxxForm-kcmc" name="kcmc">
                     <JSelectMultiple v-model:value="item.kclb" placeholder="请选择毕业论文（设计）类别，如果不选，默认全部" dictCode="kcxz"></JSelectMultiple>