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/anncomgrotop/controller/AnnComGroTopController.java

@@ -115,6 +115,8 @@ public class AnnComGroTopController extends JeecgController<AnnComGroTop, IAnnCo
 		 QueryWrapper<Expert> queryWrapperep = QueryGenerator.initQueryWrapper(expert, req.getParameterMap());
 		 queryWrapperep.eq("user_id",sysUser.getId());
 		 List<Expert> listep = expertService.list(queryWrapperep);
+		 
+
 		 ExpGroup expGroup = new ExpGroup();
 		 QueryWrapper<ExpGroup> queryWrappereg = QueryGenerator.initQueryWrapper(expGroup, req.getParameterMap());
 		 queryWrappereg.eq("grouid",listep.get(0).getId());

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java

@@ -209,34 +209,51 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
         QueryWrapper<Expert> exqueryWrapper = new QueryWrapper<>();
         exqueryWrapper.eq("user_id", loginUser.getId());
         Expert expert = expertService.getOne(exqueryWrapper);
+        if(expert==null)
+        {
+            return Result.OK(null);
+        }
         //开始获取exp-comp
         QueryWrapper<CompExp> coexqueryWrapper = new QueryWrapper<>();
         coexqueryWrapper.eq("expid", expert.getId());
         List<CompExp> compExpList = compExpService.list(coexqueryWrapper);
         List<String> compIdListss = new ArrayList<>();
-        for (CompExp compExps : compExpList) {
-            compIdListss.add(compExps.getCompid());
+        List<Comp> compList =new ArrayList<>();
+        if(compExpList.size()>0)
+        {
+            for (CompExp compExps : compExpList) {
+                compIdListss.add(compExps.getCompid());
+            }
+            QueryWrapper<Comp> coqueryWrapper = new QueryWrapper<>();
+            coqueryWrapper.in("id",compIdListss);
+            compList = compService.list(coqueryWrapper);
         }
-        QueryWrapper<Comp> coqueryWrapper = new QueryWrapper<>();
-        coqueryWrapper.in("id",compIdListss);
-        List<Comp> compList = compService.list(coqueryWrapper);
-        List<String> needlist = new ArrayList<>();
-        for (Comp comp : compList){
-            needlist.add(comp.getId());
+        List<AnnualComp> annualCompList=new ArrayList<>();
+        if(compList.size()>0)
+        {
+            List<String> needlist = new ArrayList<>();
+            for (Comp comp : compList){
+                needlist.add(comp.getId());
+            }
+            QueryWrapper<AnnualComp> anncoqueryWrapper = new QueryWrapper<>();
+            anncoqueryWrapper.in("compid",needlist);
+            annualCompList = annualCompService.list(anncoqueryWrapper);
         }
-        QueryWrapper<AnnualComp> anncoqueryWrapper = new QueryWrapper<>();
-        anncoqueryWrapper.in("compid",needlist);
-        List<AnnualComp> annualCompList = annualCompService.list(anncoqueryWrapper);
         List<String> stringList = new ArrayList<>();
-        for (AnnualComp annualComp : annualCompList){
-            stringList.add(annualComp.getId());
-        }
-        queryWrapper.in("annual_comp_id",stringList);
-
-        Page<AnnualCompPoint> page = new Page<AnnualCompPoint>(pageNo, pageSize);
-        IPage<AnnualCompPoint> pageList = annualCompPointService.page(page, queryWrapper);
+        if(annualCompList.size()>0)
+        {
+            for (AnnualComp annualComp : annualCompList){
+                stringList.add(annualComp.getId());
+            }
+            queryWrapper.in("annual_comp_id",stringList);
 
-        return Result.OK(pageList);
+            Page<AnnualCompPoint> page = new Page<AnnualCompPoint>(pageNo, pageSize);
+            IPage<AnnualCompPoint> pageList = annualCompPointService.page(page, queryWrapper);
+            return Result.OK(pageList);
+        }else
+        {
+            return Result.OK(null);
+        }
     }
 
     /**

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java

@@ -95,6 +95,10 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
         QueryWrapper<Expert> exqueryWrapper = new QueryWrapper<>();
         exqueryWrapper.eq("user_id", loginUser.getId());
         Expert expert = expertService.getOne(exqueryWrapper);
+        if(expert==null)
+        {
+            return Result.OK(null);
+        }
         //开始获取exp-comp
         QueryWrapper<CompExp> coexqueryWrapper = new QueryWrapper<>();
         coexqueryWrapper.eq("expid", expert.getId());
@@ -103,16 +107,27 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
         for (CompExp compExps : compExpList) {
             compIdListss.add(compExps.getCompid());
         }
-        QueryWrapper<Comp> coqueryWrapper = new QueryWrapper<>();
-        coqueryWrapper.in("id",compIdListss);
-        List<Comp> compList = compService.list(coqueryWrapper);
+        List<Comp> compList=new ArrayList();
+        if(compExpList.size()>0)
+        {
+            QueryWrapper<Comp> coqueryWrapper = new QueryWrapper<>();
+            coqueryWrapper.in("id",compIdListss);
+             compList = compService.list(coqueryWrapper);
+        }
         List<String> needlist = new ArrayList<>();
         for (Comp comp : compList){
             needlist.add(comp.getId());
         }
-        queryWrapper.in("compid",needlist);
-        IPage<AnnualComp> pageList = annualCompService.page(page, queryWrapper);
-        return Result.OK(pageList);
+        if(needlist.size()>0)
+        {
+            queryWrapper.in("compid",needlist);
+            IPage<AnnualComp> pageList = annualCompService.page(page, queryWrapper);
+            return Result.OK(pageList);
+        }else
+        {
+            return Result.OK(null);
+        }
+
     }
 
     /**

jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList2.vue

@@ -12,8 +12,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增 </a-button>-->
-        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
-        </a-button>
+      <!--  <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
+        </a-button>-->
         <!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls"> 导入 </j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>

jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue

@@ -91,21 +91,21 @@
                     <a-button :loading="loginLoading" class="aui-link-login aui-flex-box" type="primary" @click="loginHandleClick">
                       {{ t('sys.login.loginButton') }}</a-button>
                   </div>
-                  <div class="aui-flex">
+                 <!-- <div class="aui-flex">
                     <a class="aui-linek-code aui-flex-box" @click="codeHandleClick">{{ t('sys.login.qrSignInFormTitle') }}</a>
-                  </div>
+                  </div>-->
                   <div class="aui-flex">
                     <a class="aui-linek-code aui-flex-box" @click="registerHandleClick">{{ t('sys.login.registerButton') }}</a>
                   </div>
                 </div>
               </div>
               <a-form @keyup.enter.native="loginHandleClick">
-                <div class="aui-flex aui-third-text">
+               <!-- <div class="aui-flex aui-third-text">
                   <div class="aui-flex-box aui-third-border">
                     <span>{{ t('sys.login.otherSignIn') }}</span>
                   </div>
-                </div>
-                <div class="aui-flex" :class="`${prefixCls}-sign-in-way`">
+                </div>-->
+              <!--  <div class="aui-flex" :class="`${prefixCls}-sign-in-way`">
                   <div class="aui-flex-box">
                     <div class="aui-third-login">
                       <a title="github" @click="onThirdLogin('github')"><GithubFilled /></a>
@@ -126,7 +126,7 @@
                       <a title="微信" @click="onThirdLogin('wechat_open')"><WechatFilled /></a>
                     </div>
                   </div>
-                </div>
+                </div>-->
               </a-form>
             </div>
           </div>