Merge remote-tracking branch 'origin/master'

client_h5/src/pages/leave/index.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import { onMounted } from  'vue'
 import { useRoute } from 'vue-router';
 import { FlowDTO, getNextActivity } from '@/service/flow';
+import reqest from "@/utils/request";
 
 
 const route = useRoute();
@@ -14,13 +16,32 @@ const activityData: FlowDTO = {
   flowOpinion: ''
 }
 const submitNextActivity = async () => {
-  const result = await getNextActivity(activityData)
+  const result = await getNextActivity(jsonToFormData(activityData))
   // getNextActivity(activityData).then(result => {
   //   console.log(result)
   // }).catch((err) => {
   //   console.error(err)
   // })
 }
+const jsonToFormData = (json: any): FormData | null => {
+  const keys: string[] = Object.keys(json)
+  if (keys.length > 0) { 
+    const formData = new FormData();
+    keys.forEach((key) => { 
+      formData.append(key, (json[key] instanceof Object) ? JSON.stringify(json[key]) : json[key]);
+    });
+    return formData;
+  }
+  return null;
+}
+
+/** 初始化 */
+onMounted(() => {
+  activityData.activityInstanceId='018f23b914660a07729e8f224db60203'
+  activityData.participantId='018f23b9148b0a07729e8f224db60205'
+  activityData.flowOpinion='{"id":"018f23b914970a07729e8f224db60206","opinionContent":"同意","opinionTime":"2024-04-28"}'
+  submitNextActivity()
+})
 </script>
 
 <template>

client_h5/src/service/flow.ts

@@ -10,5 +10,7 @@ export interface FlowDTO {
  * 获取下一步活动
  * **/
 export const getNextActivity = async (data: FlowDTO) => {
-  return await reqest.post(`/workflow/Transfer/getNextActivity`, data);
+  return await reqest.post(`/workflow/Transfer/getNextActivity`, data,{
+    headers: { 'Authorization': 'Bearer test83e06d0d-af60-4419-9437-c9a68bf1b669' }
+  });
 }

zjugis-business/src/main/resources/templates/RecruitDemand/js/index.js

@@ -150,15 +150,7 @@
 
 
     function detailTotalInit(i) {
-        let obj = {
-            post: "",
-            requireNum: "",
-            recruitNum: "",
-            jobRequest: "",
-            postDuty: "",
-            remark: "",
-            type: "",
-        }
+        let obj = isTimes[i];
         let inps1 = $("[name='RecruitDetailDO[" + i + "]$requireNum']")[0].children[0]; //需求人数
         let inps2 = $("[name='RecruitDetailDO[" + i + "]$recruitNum']")[0].children[0]; //需求人数
         inps1.addEventListener("blur", e => {

zjugis-framework/zjugis-spring-boot-starter-security/src/main/java/com/zjugis/framework/security/core/util/SecurityFrameworkUtils.java

@@ -114,18 +114,12 @@ public class SecurityFrameworkUtils {
      */
     public static LoginUser mockLoginUser(HttpServletRequest request, String token, Integer userType) {
 
-//        // 必须以 mockSecret 开头
-//        if (!token.startsWith("test")) {
-//            return null;
-//        }
-        // 构建模拟用户
-//        String userId = token.substring("test".length());
-        String userId = "";
-        if("test1".equals(token)){
-            userId = "dc794fe0-66fe-4b1d-9273-f747950b27c3";
-        } else {
+        // 必须以 mockSecret 开头
+        if (!token.startsWith("test")) {
             return null;
         }
+        // 构建模拟用户
+        String userId = token.substring("test".length());
         return new LoginUser().setId(userId).setUserType(userType)
                 .setTenantId(WebFrameworkUtils.getTenantId(request));
     }