Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -84,6 +84,7 @@ public class ShiroConfig {
         }
 
         // 配置不会被拦截的链接 顺序判断
+        filterChainDefinitionMap.put("/expert/expert/getdepdata", "anon"); //注册的时候查询部门
         filterChainDefinitionMap.put("/instrument/instrument/listcms", "anon"); //cms仪器资源接口
         filterChainDefinitionMap.put("/instrument/instrument/queryByIdCms", "anon"); //cms仪器资源接口
         filterChainDefinitionMap.put("/disciplinefieid/disciplineFieid/listcms", "anon"); //cms学科领域接口

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

@@ -2,9 +2,6 @@ package org.jeecg.modules.demo.expert.controller;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,13 +10,13 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.disciplinefieid.entity.DisciplineFieid;
 import org.jeecg.modules.demo.disciplinefieid.service.IDisciplineFieidService;
 import org.jeecg.modules.demo.expert.entity.ExpCmsVo;
+import org.jeecg.modules.demo.expert.entity.ExpDepVos;
 import org.jeecg.modules.demo.expert.entity.ExpdefVo;
 import org.jeecg.modules.demo.expert.entity.Expert;
 import org.jeecg.modules.demo.expert.service.IExpertService;
@@ -38,22 +35,13 @@ import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 /**
  * @Description: 专家管理
@@ -928,14 +916,23 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 		 expertService.updateById(expert);
 		 return Result.OK("驳回成功，已责令专家重新编辑!");
 	 }
-	 @AutoLog(value = "专家管理-公司驳回")
-	 @ApiOperation(value="专家管理-公司驳回", notes="专家管理-公司驳回")
-	 @RequestMapping(value = "/saveOrUpdatefimebh", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<String> saveOrUpdatefimebh(@RequestBody Expert expert) {
-		 expert.setCompopen("3");
-
-		 expertService.updateById(expert);
-		 return Result.OK("编辑成功!");
+	 @AutoLog(value = "查找法人部门")
+	 @ApiOperation(value="查找法人部门", notes="查找法人部门")
+	 @GetMapping(value = "/getdepdata")
+	 public Result< List<ExpDepVos>> getdepdata() {
+		List<SysDepart> departs = sysDepartService.list();
+		 List<SysDepart> departstemp = departs.stream()
+				 .filter(depart -> depart.getDepartNameAbbr() != null && !depart.getDepartNameAbbr().isEmpty())
+				 .collect(Collectors.toList());
+		 List<ExpDepVos> expDepVos =new ArrayList<>();
+
+		 for (SysDepart depart : departstemp) {
+			 ExpDepVos expDepVo =new ExpDepVos();
+			 expDepVo.setDepid(depart.getId());
+			 expDepVo.setDepname(depart.getDepartName());
+			 expDepVos.add(expDepVo);
+		 }
+		 return Result.OK(expDepVos);
 	 }
 
 }

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpDepVos.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.demo.expert.entity;
+
+import lombok.Data;
+
+@Data
+public class ExpDepVos {
+    private String depid;
+    private String depname;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -211,7 +211,8 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 				if (oConvertUtils.isEmpty(sysDepart.getParentId())) {
 					sysDepart.setOrgCategory("1");
 				} else {
-					sysDepart.setOrgCategory("2");
+					//sysDepart.setOrgCategory("2");原来设置为2，暂时设置3
+					sysDepart.setOrgCategory("3");
 				}
 			}
 			this.save(sysDepart);

jeecgboot-vue3/src/api/sys/user.ts

@@ -49,6 +49,7 @@ enum Api {
   getLoginQrcode = '/sys/getLoginQrcode',
   //监控二维码扫描状态
   getQrcodeToken = '/sys/getQrcodeToken',
+  getdepdataapi= '/expert/expert/getdepdata',
 }
 
 /**
@@ -239,3 +240,8 @@ export async function validateCasLogin(params) {
   let url = Api.validateCasLogin;
   return defHttp.get({ url: url, params });
 }
+
+export async function getdepdata(params) {
+  let url = Api.getdepdataapi;
+  return defHttp.get({ url: url, params });
+}

jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="container">
     <div class="small">
-      <ul>
+      <!-- <ul>
         <li>首页</li>
         <li>|</li>
         <li>仪器共享</li>
         <li>|</li>
         <li>科研校园</li>
-      </ul>
+      </ul> -->
     </div>
     <div class="header">
       <div class="headerLeft">

jeecgboot-vue3/src/views/demo/main-home/components/projectDeclaration/index.vue

@@ -5,7 +5,7 @@
       <div class="resultShow">
         <div class="top">
           <div class="a">项目咨询</div>
-          <div class="aa">更多</div>
+          <div style="cursor: pointer;"class="aa" @click="router.push('/main-home/newsList')">更多</div>
         </div>
         <div class="buttom">
           <ul>

jeecgboot-vue3/src/views/expert/selfback/Expert.data.ts

@@ -66,6 +66,11 @@ export const columns: BasicColumn[] = [
       return  render.renderSwitch(text, [{text:'正常',value:'N'},{text:'异常',value:'Y'}]);
     },
   },
+  {
+    title: '异常原因',
+    align: "center",
+    dataIndex: 'errinfo_dictText'
+  },
 ];
 
 // 高级查询数据

jeecgboot-vue3/src/views/system/loginmini/MiniRegisterexp.vue

@@ -66,8 +66,28 @@
 
                   <a-form-item>
                     <div class="aui-input-line">
-                      <JSelectDept :placeholder="t('sys.login.selectorgPlaceholder')" v-model:value="formData.ssdep" :multiple="false" />
+
+<!--                      <JSelectDept :placeholder="t('sys.login.selectorgPlaceholder')" v-model:value="formData.ssdep" :multiple="false" />-->
+
+                        <j-search-select
+                          placeholder="选择所属单位"
+                          v-model:value="formData.ssdep"
+                          :dictOptions="dictOptions">
+                        </j-search-select>
+                        {{ selectValue }}
+
                     </div>
+
+
+
+
+
+
+
+
+
+
+
                   </a-form-item>
                   <a-form-item>
                     <div class="aui-input-line">
@@ -115,7 +135,7 @@
 <script lang="ts" setup name="mini-register">
 
   import { ref, reactive, unref, toRaw,onMounted } from 'vue';
-  import { getCaptcha, registerFaren, registerexp,getCodeInfo } from '/@/api/sys/user';
+  import { getCaptcha, registerFaren, registerexp,getCodeInfo,getdepdata } from '/@/api/sys/user';
   import { SmsEnum } from '/@/views/sys/login/useLogin';
   import { useMessage } from '/@/hooks/web/useMessage';
   import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png';
@@ -125,7 +145,12 @@
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   import codeImg from '/@/assets/images/checkcode.png';
+  import {findprojectandnumber} from "@/views/dashboard/workbench/components/api";
+  import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
 
+
+  const selectValue=ref('');
+  const   dictOptions=ref([]);
   const { t } = useI18n();
   const { notification, createErrorModal, createMessage } = useMessage();
   const emit = defineEmits(['go-back', 'success', 'register']);
@@ -164,6 +189,20 @@
   //确认密码眼睛打开关闭
   const confirmPwdIndex = ref<string>('close');
 
+
+  function item03(){
+    getdepdata().then(res => {
+      console.log(res,"res")
+      dictOptions.value = res.map(item => {
+        return {text:item.depname,value:item.depid}
+      })
+      // res.forEach(item => {
+      //   dictOptions.value.push(item);
+      // });
+      console.log(dictOptions.value,"dictOptions")
+
+    })}
+  item03();
   /**
    * 返回
    */