From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java
index f0ed4e4..7814035 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java
@@ -4,7 +4,6 @@
 import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.log.LogObjectHolder;
-import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.controller.util.Base64Util;
 import com.stylefeng.guns.modular.system.model.TBank;
@@ -38,24 +37,27 @@
 @Controller
 @RequestMapping("/tEnterpriseWithdrawal")
 public class TEnterpriseWithdrawalController extends BaseController {
-
+    
     private String PREFIX = "/system/tEnterpriseWithdrawal/";
-
+    
     @Autowired
     private ITEnterpriseWithdrawalService tEnterpriseWithdrawalService;
-
+    
     @Autowired
     private ITBankService bankService;
-
+    
     @Autowired
     private ITBankNextService bankNextService;
+    
+    @Resource
+    private ShiroExtUtil shiroExtUtil;
     
     /**
      * 跳转到首页
      */
     @RequestMapping("")
     public String index(Model model) {
-        TEnterpriseWithdrawal companyId = tEnterpriseWithdrawalService.selectOne(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", ShiroExtUtil.getUser().getObjectId()));
+        TEnterpriseWithdrawal companyId = tEnterpriseWithdrawalService.selectOne(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
         if (companyId != null) {
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             model.addAttribute("item", companyId);
@@ -138,7 +140,7 @@
     @Transactional(readOnly = false,propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public Object add(TEnterpriseWithdrawal tEnterpriseWithdrawal,Integer accountType,String code,String businessExpireTimeOne,String unifiedSocialCreditCodeExpireTimeOne,String certificateExpireTimeOne) {
         tEnterpriseWithdrawal.setCode(code);
-        List<TEnterpriseWithdrawal> companyId = tEnterpriseWithdrawalService.selectList(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", ShiroExtUtil.getUser().getObjectId()));
+        List<TEnterpriseWithdrawal> companyId = tEnterpriseWithdrawalService.selectList(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
         if(companyId.size()>0){
             return "5001";
         }
@@ -148,23 +150,23 @@
             tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime()+",长期");
         }
         if(ToolUtil.isNotEmpty(unifiedSocialCreditCodeExpireTimeOne)){
-            tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime()+","+unifiedSocialCreditCodeExpireTimeOne);
-        }else {
-            tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime()+",长期");
-
+            tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime() + "," + unifiedSocialCreditCodeExpireTimeOne);
+        } else {
+            tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime() + ",长期");
+    
         }
-        if(ToolUtil.isNotEmpty(certificateExpireTimeOne)){
-            tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime()+","+certificateExpireTimeOne);
-        }else {
-            tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime()+",长期");
+        if (ToolUtil.isNotEmpty(certificateExpireTimeOne)) {
+            tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime() + "," + certificateExpireTimeOne);
+        } else {
+            tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime() + ",长期");
         }
     
         tEnterpriseWithdrawal.setIsAudit(1);
-        tEnterpriseWithdrawal.setCompanyId(ShiroExtUtil.getUser().getObjectId());
+        tEnterpriseWithdrawal.setCompanyId(shiroExtUtil.getUser().getObjectId());
         tEnterpriseWithdrawal.setAccountType(accountType);
         String randomString = ToolUtil.getRandomString(32);
         tEnterpriseWithdrawal.setOutRequestNo(randomString);
-        if(tEnterpriseWithdrawal.getEnterpriseType()==1){
+        if (tEnterpriseWithdrawal.getEnterpriseType() == 1) {
             tEnterpriseWithdrawal.setAccountType(2);
         }
         try {

--
Gitblit v1.7.1