From f43a389c6e67676dcf2bbeabc16a80c15778d890 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Wed, 10 Jan 2024 18:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=B7=E8=8D=89=E7=BB=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayDraftingGroupController.java           |  8 ++++
 .../PayDraftingGroupSubItemController.java    |  2 +-
 .../mapper/xml/PayDraftingGroupMapper.xml     | 13 +++---
 .../PayDraftingGroupSubItemServiceImpl.java   |  8 ++--
 .../DraftGroupMeetingSituationController.java | 40 +++++++++----------
 5 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
index 5e8cca90..c9c7f675 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
@@ -18,7 +18,9 @@ import com.jero.drafting.vo.PayDraftingGroupVo;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.service.IPayWorkingGroupService;
+import com.jero.util.QrcodeUtil;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -290,6 +292,12 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
         payDraftingGroupService.setPayDraftingGroup(payDraftingGroup);
         payDraftingGroupService.updateById(payDraftingGroup);
         return Result.OK("编辑成功!");
+    }
 
+    @ApiOperation(value = "生成base64")
+    @GetMapping(value = "/createBase64")
+    @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query")
+    public Result<String> createBase64(String contact) {
+        return Result.OK(QrcodeUtil.create(contact));
     }
 }
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
index 468cea08..8197fc2a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
@@ -369,7 +369,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      * 审核起草组报名信息
      */
     @AutoLog(value = "审核起草组报名信息")
-//    @RequiresPermissions("draftGroupMeetingSituation:auditCredentials")
+    @RequiresPermissions("draftingGroupMember:check")
     @ApiOperation(value = "审核起草组报名信息")
     @PostMapping(value = "/checkRegister")
     public Result<?> checkRegister(@RequestBody CheckVo checkVO) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
index 4ca240c5..fd3940c6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
@@ -25,15 +25,12 @@
         left join sys_user su on pdg.principal_id_a = su.id
         left join sys_user su1 on pdg.principal_id_b = su1.id
         left join pay_working_group pwg on pwg.id = pdg.working_group_id
-        left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id
-        left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id
-<!--        <if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')-->
-<!--        or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">-->
-<!--            left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id-->
-<!--            left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id-->
-<!--        </if>-->
+        <if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')
+        or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">
+            left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id
+            left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id
+        </if>
         <where>
-            pdgs.check_result = 1 OR pdgs.check_result = 2
             <if test="payDraftingGroup.draftingGroupProject != null and payDraftingGroup.draftingGroupProject != ''">
                 AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
             </if>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
index d45ed8d7..fd6d64e2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
@@ -697,8 +697,10 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
         PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(draftingGroupId);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String sysUserId = sysUser.getId();
-//        if (!rolePermissionService.getRolePermission("draftingGroupMember:check") && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUserId)) {
-//           throw new JeroBootException("没有审核的权限");
-//        }
+        if (!rolePermissionService.getRolePermission("draftingGroupMember:check") &&
+                !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUserId) &&
+                !Objects.equals(payDraftingGroup.getPrincipalIdB(),sysUserId)) {
+           throw new JeroBootException("没有审核的权限");
+        }
     }
 }
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java
index b8d5c4a1..030ebc28 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java
@@ -67,7 +67,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
      * 分页列表查询
      */
     @CompanyNameTranslate
-//    @RequiresPermissions("draftGroupMeetingSituation:search")
+    @RequiresPermissions("draftGroupMeetingSituation:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
     public Result<?> queryPageList(PayMeetingSituation payMeetingSituation,
@@ -101,7 +101,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
     /**
      * 添加参会人
      */
-//    @RequiresPermissions("draftGroupMeetingSituation:add")
+    @RequiresPermissions("draftGroupMeetingSituation:add")
     @AutoLog(value = "参会人员信息-添加参会人")
     @ApiOperation(value = "参会人员信息-添加参会人", notes = "参会人员信息-添加参会人")
     @PostMapping(value = "/add")
@@ -114,7 +114,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
      * 编辑
      */
     @AutoLog(value = "参会人员信息-编辑")
-//    @RequiresPermissions("draftGroupMeetingSituation:edit")
+    @RequiresPermissions("draftGroupMeetingSituation:edit")
     @ApiOperation(value = "参会人员信息-编辑", notes = "参会人员信息-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) {
@@ -125,7 +125,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
     /**
      * 通过id删除
      */
-//    @RequiresPermissions("draftGroupMeetingSituation:delete")
+    @RequiresPermissions("draftGroupMeetingSituation:delete")
     @AutoLog(value = "参会人员信息-通过id删除")
     @ApiOperation(value = "参会人员信息-通过id删除", notes = "参会人员信息-通过id删除")
     @GetMapping(value = "/delete")
@@ -140,7 +140,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
     /**
      * 批量删除
      */
-//    @RequiresPermissions("draftGroupMeetingSituation:batchDel")
+    @RequiresPermissions("draftGroupMeetingSituation:batchDel")
     @AutoLog(value = "参会人员信息-批量删除")
     @ApiOperation(value = "参会人员信息-批量删除", notes = "参会人员信息-批量删除")
     @GetMapping(value = "/deleteBatch")
@@ -186,7 +186,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
      * 审核报名信息
      */
     @AutoLog(value = "审核报名信息")
-//    @RequiresPermissions("draftGroupMeetingSituation:auditCredentials")
+    @RequiresPermissions("draftGroupMeetingSituation:auditCredentials")
     @ApiOperation(value = "审核报名信息")
     @PostMapping(value = "/checkRegister")
     public Result<?> checkRegister(@RequestBody CheckVO checkVO) {
@@ -194,22 +194,22 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
         return Result.OK("审核成功!");
     }
 
-    /**
-     * 审核缴费凭证
-     */
-//    @RequiresPermissions("workGroupMeetingSituation:auditCredentials")
-    @AutoLog(value = "审核缴费凭证")
-    @ApiOperation(value = "审核缴费凭证")
-    @PostMapping(value = "/check")
-    public Result<?> check(@RequestBody CheckVO checkVO) {
-        payMeetingSituationService.check(checkVO);
-        return Result.OK("审核成功!");
-    }
+//    /**
+//     * 审核缴费凭证
+//     */
+//    @RequiresPermissions("draftGroupMeetingSituation:auditSignUp")
+//    @AutoLog(value = "审核缴费凭证")
+//    @ApiOperation(value = "审核缴费凭证")
+//    @PostMapping(value = "/check")
+//    public Result<?> check(@RequestBody CheckVO checkVO) {
+//        payMeetingSituationService.check(checkVO);
+//        return Result.OK("审核成功!");
+//    }
 
     /**
      * 设置嘉宾上传文件
      */
-//    @RequiresPermissions("draftGroupMeetingSituation:guestsUploadFileFlag")
+    @RequiresPermissions("draftGroupMeetingSituation:guestsUploadFileFlag")
     @AutoLog(value = "设置嘉宾上传文件")
     @ApiOperation(value = "设置嘉宾上传文件", notes = "设置嘉宾上传文件")
     @PostMapping(value = "/setGuestsUploadFile")
@@ -222,7 +222,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
     /**
      * 导出excel
      */
-//    @RequiresPermissions("draftGroupMeetingSituation:export")
+    @RequiresPermissions("draftGroupMeetingSituation:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
         List<Object> objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE);
@@ -239,7 +239,7 @@ public class DraftGroupMeetingSituationController extends JeroController<PayMeet
      * @param paymentDate            日期
      * @return
      */
-//    @RequiresPermissions("draftingGroupMember:search")
+    @RequiresPermissions("draftingGroupMember:search")
     @ApiOperation(value = "起草组成员-发布提醒列表查询")
     @GetMapping(value = "/publishReminderList")
     public Result<?> publishReminderList(PayDraftingGroupSubItem payDraftingGroupSubItem,