From 8d640e63cbabf2f07c339e0ef9bdc1b1fb9c6847 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 31 Aug 2023 17:59:11 +0800
Subject: [PATCH] debug

---
 .../qs/serve/common/util/AuthContextUtils.java   | 15 +++++++++------
 .../modules/baz/entity/BazVisitInstance.java     |  5 +++++
 .../sys/controller/SysUserController.java        | 16 ++++++++++++++--
 .../impl/TbsBudgetApplyOperationServiceImpl.java |  5 ++---
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/qs/serve/common/util/AuthContextUtils.java b/src/main/java/com/qs/serve/common/util/AuthContextUtils.java
index a92bcc5d..04114b7c 100644
--- a/src/main/java/com/qs/serve/common/util/AuthContextUtils.java
+++ b/src/main/java/com/qs/serve/common/util/AuthContextUtils.java
@@ -80,25 +80,28 @@ public class AuthContextUtils {
     }
 
     public static BmsSupplier getCurrentSupplier(){
+        String userId = AuthContextUtils.getSysUserId();
         Long supplierId = AuthContextUtils.getSupplierId();
         BmsSupplierService supplierService = SpringUtils.getBean(BmsSupplierService.class);
-        WxUserService wxUserService = SpringUtils.getBean(WxUserService.class);
-        WxUser wxUser = wxUserService.getCurrentWxUser();
         BmsSupplier supplier = supplierService.getById(supplierId);
+        if(supplier==null){
+            Assert.throwEx(4106,"供应商无效或未授权");
+        }
         boolean isOther = false;
+
         if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){
             for (String otherUserId : supplier.getOtherUserIds()) {
-                if(wxUser.getSysUserId().equals(otherUserId)){
+                if(userId.equals(otherUserId)){
                     isOther = true;
                     break;
                 }
             }
         }
-        if(isOther && !supplier.getUserId().equals(wxUser.getSysUserId())){
-            Assert.throwEx("供应商无效或未授权");
+        if(isOther && !supplier.getUserId().equals(userId)){
+            Assert.throwEx(4106,"供应商无效或未授权");
         }
         if(supplier.getStopFlag().equals(1)){
-            Assert.throwEx("供应商已停用");
+            Assert.throwEx(4106,"供应商已停用");
         }
         return supplier;
     }
diff --git a/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java b/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java
index ef6b89a2..d5cf4201 100644
--- a/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java
+++ b/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java
@@ -101,6 +101,11 @@ public class BazVisitInstance implements Serializable {
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
 
+    @TableField(condition = SqlCondition.LIKE)
+    private String positionStatusContent;
+
+    private String positionStatus;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
index 55158926..f691d86c 100644
--- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
+++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
@@ -175,6 +175,19 @@ public class SysUserController {
     }
 
 
+    /**
+     * (个人)更新OA密码
+     * @param param
+     * @return
+     */
+    @SysLog(title = "人员",desc = "个人密码更新",biz = BizType.UPDATE)
+    @PostMapping("/updateOAPwd")
+    public R<?> updateOAPwd(@RequestBody SysUserPwdParam param){
+        SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
+        sysUserService.updateSeeYonPassword(sysUser.getSyUserId(),param.getNewPassword());
+        return R.ok();
+    }
+
     /**
      * (个人)密码更新H5
      * @param param
@@ -189,7 +202,7 @@ public class SysUserController {
         sysUser.setPassword(SecureUtil.md5(param.getNewPassword()));
         sysUser.setUpdateTime(LocalDateTime.now());
         sysUserService.updateById(sysUser);
-        sysUserService.updateSeeYonPassword(sysUser.getSyUserId(),param.getNewPassword());
+        //sysUserService.updateSeeYonPassword(sysUser.getSyUserId(),param.getNewPassword());
         return R.ok();
     }
 
@@ -209,7 +222,6 @@ public class SysUserController {
             sysUser.setPassword(SecureUtil.md5(param.getNewPassword()));
             sysUser.setUpdateTime(LocalDateTime.now());
             sysUserService.updateById(sysUser);
-            sysUserService.updateSeeYonPassword(sysUser.getSyUserId(),param.getNewPassword());
             return R.ok();
         }
         return R.error();
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
index e707d29a..8184f5dd 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
@@ -88,12 +88,11 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic
             lqw.eq(TbsScheduleItemBudget::getBudgetId,param.getTargetId());
             List<TbsScheduleItemBudget> scheduleItemBudgets = scheduleItemBudgetService.list(lqw);
             //保存预算流水日志
+            log.debug("保存预算流水日志 scheduleItemBudgets:{}",scheduleItemBudgets.size());
             List<TbsBudgetLog> budgetLogList = new ArrayList<>();
             for (TbsScheduleItemBudget scheduleItemBudget : scheduleItemBudgets) {
                 TbsBudgetLog budgetLog = TbsBudgetLogBuildUtil.toTbsBudgetLog(sysUser, tbsBudget, scheduleItemBudget, BudgetLogOptFlag.State_0,scheduleItemBudget.getBudgetAmount());
-                if (budgetLog!=null){
-                    budgetLogList.add(budgetLog);
-                }
+                budgetLogList.add(budgetLog);
             }
             budgetLogService.saveBatch(budgetLogList);