Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/mineCenter/components/rightBox.vue

@@ -8,9 +8,13 @@
           :class="rightTabsIndex == index ? 'liActive' : ''"
           @click="rightTabsClick(item, index)"
         >
-          <img
-            :src="rightTabsIndex == index ? getAssetURL(item.icon + '_1') : getAssetURL(item.icon)"
-          />
+          <el-badge :value="0" class="item" :hidden="item.badgeHidden">
+            <img
+              :src="
+                rightTabsIndex == index ? getAssetURL(item.icon + '_1') : getAssetURL(item.icon)
+              "
+            />
+          </el-badge>
           <p>{{ item.name }}</p>
         </li>
       </ul>
@@ -50,35 +54,43 @@ const WdBzj = defineAsyncComponent(() => {
 const rightTabsList = ref([
   {
     icon: 'wdda',
-    name: '我的档案'
+    name: '我的档案',
+    badgeHidden: true
   },
   {
     icon: 'wdxz',
-    name: '我的薪资'
+    name: '我的薪资',
+    badgeHidden: true
   },
   {
     icon: 'clbx',
-    name: '差旅报销'
+    name: '差旅报销',
+    badgeHidden: true
   },
   {
     icon: 'ptbx',
-    name: '普通报销'
+    name: '普通报销',
+    badgeHidden: true
   },
   {
     icon: 'gdzc',
-    name: '固定资产'
+    name: '固定资产',
+    badgeHidden: true
   },
   {
     icon: 'wdyk',
-    name: '我的用款'
+    name: '我的用款',
+    badgeHidden: true
   },
   {
     icon: 'wdjk',
-    name: '我的借款'
+    name: '我的借款',
+    badgeHidden: false
   },
   {
     icon: 'wdbzj',
-    name: '我的保证金'
+    name: '我的保证金',
+    badgeHidden: false
   }
 ])
 const rightTabsIndex = ref(0)

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/service/CommonCostServiceImpl.java

@@ -88,6 +88,8 @@ public class CommonCostServiceImpl implements CommonCostService {
                 entity.setApplyTime(LocalDateTime.now());
                 entity.setCreateTime(LocalDateTime.now());
                 entity.setFlowStatus(FLOW_NOT_START);
+                entity.setPaymentCompanyId("4e99393c-c0ea-4146-a7fb-56fb8019c477");
+                entity.setPaymentMethod(1);
                 CommonResult<AdminUserRespDTO> result = adminUserApi.getUser(userId);
                 if (result.isSuccess()) {
                     entity.setUserNickname(result.getData().getNickname());