Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

client_h5/src/pages/interview/index.vue

@@ -1,65 +1,65 @@
 <template>
   <flow-form :data="formData" @submit="submitNextActivity">
     <card title="基础信息" style="height: auto">
-      <van-form  ref="form">
+      <van-form ref="form">
         <van-cell-group insert>
           <van-field
-              v-model="formData.nickname"
-              name="员工名称"
-              label="员工名称"
-              placeholder="员工名称"
-              readonly
+            v-model="formData.nickname"
+            name="员工名称"
+            label="员工名称"
+            placeholder="员工名称"
+            readonly
           />
           <van-field
-              v-model="formData.mssjc"
-              name="面试时间"
-              label="面试时间"
-              placeholder="面试时间"
-              readonly
+            v-model="formData.mssjc"
+            name="面试时间"
+            label="面试时间"
+            placeholder="面试时间"
+            readonly
           />
           <van-field
-              v-model="formData.sexText"
-              name="性别"
-              label="性别"
-              placeholder="性别"
-              readonly
+            v-model="formData.sexText"
+            name="性别"
+            label="性别"
+            placeholder="性别"
+            readonly
           />
           <van-field
-              v-model="formData.sfzh"
-              name="身份证号"
-              label="身份证号"
-              placeholder="身份证号"
-              readonly
+            v-model="formData.sfzh"
+            name="身份证号"
+            label="身份证号"
+            placeholder="身份证号"
+            readonly
           />
           <van-field
-              v-model="formData.postText"
-              name="应聘岗位"
-              label="应聘岗位"
-              placeholder="应聘岗位"
-              readonly
+            v-model="formData.postText"
+            name="应聘岗位"
+            label="应聘岗位"
+            placeholder="应聘岗位"
+            readonly
           />
           <van-field
-              v-model="formData.deptName"
-              name="应聘部门"
-              label="应聘部门"
-              placeholder="应聘部门"
-              readonly
+            v-model="formData.deptName"
+            name="应聘部门"
+            label="应聘部门"
+            placeholder="应聘部门"
+            readonly
           />
           <van-field
-              v-model="formData.mobile"
-              name="手机号"
-              label="手机号"
-              placeholder="手机号"
-              readonly
+            v-model="formData.mobile"
+            name="手机号"
+            label="手机号"
+            placeholder="手机号"
+            readonly
           />
-<!--          <van-field-->
-<!--              v-model="formData.zjjywz"-->
-<!--              name="证件交验情况"-->
-<!--              label="证件交验情况"-->
-<!--              placeholder="证件交验情况"-->
-<!--              readonly-->
-<!--              :rules="[{ required: true, message: '未获取证件交验情况' }]"-->
-<!--          />-->
+          <!--          <van-field-->
+          <!--              v-model="formData.zjjywz"-->
+          <!--              name="证件交验情况"-->
+          <!--              label="证件交验情况"-->
+          <!--              placeholder="证件交验情况"-->
+          <!--              readonly-->
+          <!--              :rules="[{ required: true, message: '未获取证件交验情况' }]"-->
+          <!--          />-->
         </van-cell-group>
       </van-form>
     </card>
@@ -68,228 +68,240 @@
       <van-form required="true" ref="form">
         <van-cell-group insert>
           <van-field
-              v-model="formData.yrybf"
-              name="仪容仪表(分)"
-              label="仪容仪表(分)"
-              placeholder="仪容仪表(分)"
-              readonly
+            v-model="formData.yrybf"
+            name="仪容仪表(分)"
+            label="仪容仪表(分)"
+            placeholder="仪容仪表(分)"
+            readonly
           />
           <van-field
-              v-model="formData.sex"
-              name="说服力(分)"
-              label="说服力(分)"
-              placeholder="说服力(分)"
-              readonly
+            v-model="formData.xxlf"
+            name="学习力(分)"
+            label="学习力(分)"
+            placeholder="学习力(分)"
+            readonly
           />
           <van-field
-              v-model="formData.swlyf"
-              name="商务礼仪(分)"
-              label="商务礼仪(分)"
-              placeholder="商务礼仪(分)"
-              readonly
+            v-model="formData.swlyf"
+            name="商务礼仪(分)"
+            label="商务礼仪(分)"
+            placeholder="商务礼仪(分)"
+            readonly
           />
           <van-field
-              v-model="formData.kyxf"
-              name="抗压性(分)"
-              label="抗压性(分)"
-              placeholder="抗压性(分)"
-              readonly
+            v-model="formData.kyxf"
+            name="抗压性(分)"
+            label="抗压性(分)"
+            placeholder="抗压性(分)"
+            readonly
           />
           <van-field
-              v-model="formData.gtf"
-              name="沟通(分)"
-              label="沟通(分)"
-              placeholder="沟通(分)"
-              readonly
+            v-model="formData.gtf"
+            name="沟通(分)"
+            label="沟通(分)"
+            placeholder="沟通(分)"
+            readonly
           />
           <van-field
-              v-model="formData.ccf"
-              name="出差(分)"
-              label="出差(分)"
-              placeholder="出差(分)"
-              readonly
+            v-model="formData.ccf"
+            name="出差(分)"
+            label="出差(分)"
+            placeholder="出差(分)"
+            readonly
           />
           <van-field
-              v-model="formData.tdf"
-              name="态度(分)"
-              label="态度(分)"
-              placeholder="态度(分)"
-              readonly
+            v-model="formData.tdf"
+            name="态度(分)"
+            label="态度(分)"
+            placeholder="态度(分)"
+            readonly
           />
           <van-field
-              v-model="formData.xxlf"
-              name="学习力(分)"
-              label="学习力(分)"
-              placeholder="学习力(分)"
-              readonly
+            v-model="formData.jbf"
+            name="加班(分)"
+            label="加班(分)"
+            placeholder="加班(分)"
+            readonly
           />
         </van-cell-group>
       </van-form>
     </card>
 
     <card title="初始测评评语" style="height: auto">
-      <van-form  ref="form">
+      <van-form ref="form">
         <van-cell-group insert>
           <van-field
-              v-model="formData.yrybp"
-              name="仪容仪表(评)"
-              label="仪容仪表(评)"
-              placeholder="仪容仪表(评)"
-              readonly
+            v-model="formData.yrybp"
+            name="仪容仪表(评)"
+            label="仪容仪表(评)"
+            placeholder="仪容仪表(评)"
+            readonly
           />
           <van-field
-              v-model="formData.sflp"
-              name="说服力(评)"
-              label="说服力(评)"
-              placeholder="说服力(评)"
-              readonly
+            v-model="formData.xxlp"
+            name="学习力(评)"
+            label="学习力(评)"
+            placeholder="学习力(评)"
+            readonly
           />
           <van-field
-              v-model="formData.swlyp"
-              name="商务礼仪(评)"
-              label="商务礼仪(评)"
-              placeholder="商务礼仪(评)"
-              readonly
+            v-model="formData.swlyp"
+            name="商务礼仪(评)"
+            label="商务礼仪(评)"
+            placeholder="商务礼仪(评)"
+            readonly
           />
           <van-field
-              v-model="formData.kyxp"
-              name="抗压性(评)"
-              label="抗压性(评)"
-              placeholder="抗压性(评)"
-              readonly
+            v-model="formData.kyxp"
+            name="抗压性(评)"
+            label="抗压性(评)"
+            placeholder="抗压性(评)"
+            readonly
           />
           <van-field
-              v-model="formData.gtp"
-              name="沟通(评)"
-              label="沟通(评)"
-              placeholder="沟通(评)"
-              readonly
+            v-model="formData.gtp"
+            name="沟通(评)"
+            label="沟通(评)"
+            placeholder="沟通(评)"
+            readonly
           />
           <van-field
-              v-model="formData.ccp"
-              name="出差(评)"
-              label="出差(评)"
-              placeholder="出差(评)"
-              readonly
+            v-model="formData.ccp"
+            name="出差(评)"
+            label="出差(评)"
+            placeholder="出差(评)"
+            readonly
           />
           <van-field
-              v-model="formData.tdp"
-              name="态度(评)"
-              label="态度(评)"
-              placeholder="态度(评)"
-              readonly
+            v-model="formData.tdp"
+            name="态度(评)"
+            label="态度(评)"
+            placeholder="态度(评)"
+            readonly
           />
           <van-field
-              v-model="formData.xxlp"
-              name="学习力(评)"
-              label="学习力(评)"
-              placeholder="学习力(评)"
-              readonly
+            v-model="formData.jbp"
+            name="加班(评)"
+            label="加班(评)"
+            placeholder="加班(评)"
+            readonly
           />
         </van-cell-group>
       </van-form>
     </card>
 
     <card title="事业部/部门意见" style="height: auto">
-      <van-form  ref="form">
+      <van-form ref="form">
         <van-cell-group insert>
           <van-field
-              v-model="formData.ywjs"
-              name="业务及技术"
-              label="业务及技术"
-              placeholder="业务及技术"
-              readonly
-          />
-          <van-field
-              v-model="formData.xmnl"
-              name="项目能力"
-              label="项目能力"
-              placeholder="项目能力"
-              readonly
-          />
-          <van-field
-              v-model="formData.gtbd"
-              name="沟通与表达"
-              label="沟通与表达"
-              placeholder="沟通与表达"
-              readonly
-          />
-          <van-field
-              v-model="formData.zhpj"
-              name="综合评价"
-              label="综合评价"
-              placeholder="综合评价"
-              readonly
+            v-model="formData.ywjs"
+            name="业务及技术"
+            label="业务及技术"
+            placeholder="业务及技术"
+            rows="1"
+            autosize
+            type="textarea"
+            required
+          />
+          <van-field
+            v-model="formData.xmnl"
+            name="项目能力"
+            label="项目能力"
+            placeholder="项目能力"
+            rows="1"
+            autosize
+            type="textarea"
+            required
+          />
+          <van-field
+            v-model="formData.gtbd"
+            name="沟通与表达"
+            label="沟通与表达"
+            placeholder="沟通与表达"
+            rows="1"
+            autosize
+            type="textarea"
+            required
+          />
+          <van-field
+            v-model="formData.zhpj"
+            name="综合评价"
+            label="综合评价"
+            placeholder="综合评价"
+            rows="1"
+            autosize
+            type="textarea"
+            required
           />
         </van-cell-group>
       </van-form>
     </card>
 
     <card title="面试结果" style="height: auto">
-      <van-form  ref="form">
+      <van-form ref="form">
         <van-cell-group insert>
           <van-field
-              v-model="formData.ygxz"
-              name="用工性质"
-              label="用工性质"
-              placeholder="用工性质"
-              readonly
+            v-model="formData.ygxz"
+            name="用工性质"
+            label="用工性质"
+            placeholder="用工性质"
+            readonly
           />
           <van-field
-              v-model="formData.djcdText"
-              name="等级初定"
-              label="等级初定"
-              placeholder="等级初定"
-              readonly
+            v-model="formData.djcdText"
+            name="等级初定"
+            label="等级初定"
+            placeholder="等级初定"
+            readonly
           />
           <van-field
-              v-model="formData.syjbyx"
-              name="试用基本工资（元）"
-              label="试用基本工资（元）"
-              placeholder="试用基本工资（元）"
-              readonly
+            v-model="formData.syjbyx"
+            name="试用基本工资（元）"
+            label="试用基本工资（元）"
+            placeholder="试用基本工资（元）"
+            readonly
           />
           <van-field
-              v-model="formData.syjx"
-              name="试用绩效工资（元）"
-              label="试用绩效工资（元）"
-              placeholder="试用绩效工资（元）"
-              readonly
+            v-model="formData.syjx"
+            name="试用绩效工资（元）"
+            label="试用绩效工资（元）"
+            placeholder="试用绩效工资（元）"
+            readonly
           />
           <van-field
-              v-model="formData.zzjbyx"
-              name="转正基本工资（元）"
-              label="转正基本工资（元）"
-              placeholder="转正基本工资（元）"
-              readonly
+            v-model="formData.zzjbyx"
+            name="转正基本工资（元）"
+            label="转正基本工资（元）"
+            placeholder="转正基本工资（元）"
+            readonly
           />
           <van-field
-              v-model="formData.zzjx"
-              name="转正绩效工资（元）"
-              label="转正绩效工资（元）"
-              placeholder="转正绩效工资（元）"
-              readonly
+            v-model="formData.zzjx"
+            name="转正绩效工资（元）"
+            label="转正绩效工资（元）"
+            placeholder="转正绩效工资（元）"
+            readonly
           />
           <van-field
-              v-model="formData.bdrqc"
-              name="报道日期"
-              label="报道日期"
-              placeholder="报道日期"
-              readonly
+            v-model="formData.bdrqc"
+            name="报道日期"
+            label="报道日期"
+            placeholder="报道日期"
+            readonly
           />
           <van-field
-              v-model="formData.syq"
-              name="试用期（月）"
-              label="试用期（月）"
-              placeholder="试用期（月）"
-              readonly
+            v-model="formData.syq"
+            name="试用期（月）"
+            label="试用期（月）"
+            placeholder="试用期（月）"
+            readonly
           />
           <van-field
-              v-model="formData.lwq"
-              name="拟定劳务期（年）"
-              label="拟定劳务期（年）"
-              placeholder="拟定劳务期（年）"
-              readonly
+            v-model="formData.lwq"
+            name="拟定劳务期（年）"
+            label="拟定劳务期（年）"
+            placeholder="拟定劳务期（年）"
+            readonly
           />
         </van-cell-group>
       </van-form>
@@ -298,47 +310,69 @@
 </template>
 
 <script setup lang="ts">
-import {useRoute} from 'vue-router';
-import {FlowDTO, getNextActivity} from '@/service/flow';
+import { useRoute } from "vue-router";
+import { FlowDTO, getNextActivity } from "@/service/flow";
 import reqest from "@/utils/request";
-import FlowForm from '@/components/flowForm.vue';
-import Card from '@/components/card.vue';
-import {DICT_TYPE, getDictLabel} from "@/utils/dict";
+import FlowForm from "@/components/flowForm.vue";
+import Card from "@/components/card.vue";
+import { DICT_TYPE, getDictLabel } from "@/utils/dict";
 
 const route = useRoute();
 
-interface FormDataType {
-}
+interface FormDataType {}
 
-const formData = ref<FormDataType>({})
+const formData = ref<FormDataType>({
+  instanceId: "",
+  id: "",
+  ywjs: "",
+  xmnl: "",
+  gtbd: "",
+  zhpj: "",
+});
 const form = ref(null);
+const formRead = ref(false);
 
-const {activityInstanceId, participant, flowInstanceId, read} = route.query as {
-  activityInstanceId: string;
-  participant: string;
-  flowInstanceId: string;
-  read: string;
-};
+const { activityInstanceId, participant, flowInstanceId, read } =
+  route.query as {
+    activityInstanceId: string;
+    participant: string;
+    flowInstanceId: string;
+    read: string;
+  };
 const activityData: FlowDTO = {
   activityInstanceId,
   participantId: participant,
-  flowOpinion: ''
-}
+  flowOpinion: "",
+};
 const submitNextActivity = async (NextActivity: () => Promise<any>) => {
-  NextActivity();
+  form.value.validate().then(async () => {
+    //更新表单业务数据
+    formData.value.zjjy = null;
+    const result = await reqest.post(
+      "/business/interview/update",
+      formData.value
+    );
+    if (result.code === 200 || result.code === 0) {
+      //工作流转件
+      NextActivity();
+    }
+  });
 };
 
 const jsonToFormData = (json: any): FormData | null => {
-  const keys: string[] = Object.keys(json)
+  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]);
+      formData.append(
+        key,
+        json[key] instanceof Object ? JSON.stringify(json[key]) : json[key]
+      );
     });
     return formData;
   }
   return null;
-}
+};
 
 //将复选框中的数字转成文字
 function changeValue(v: String) {
@@ -377,17 +411,18 @@ function formatDate(timestamp: number) {
   const date = new Date(timestamp);
   const year = date.getFullYear();
   let month = (1 + date.getMonth()).toString();
-  month = month.length > 1 ? month : '0' + month;
+  month = month.length > 1 ? month : "0" + month;
   let day = date.getDate().toString();
-  day = day.length > 1 ? day : '0' + day;
+  day = day.length > 1 ? day : "0" + day;
   return `${year}-${month}-${day}`;
 }
 
-
 /** 初始化表单数据 */
 const initFormData = async () => {
-  const result = await reqest.get(`/business/interview/mobileAdd?flowInstanceId=${flowInstanceId}`)
-  formData.value = result.data
+  const result = await reqest.get(
+    `/business/interview/mobileAdd?flowInstanceId=${flowInstanceId}`
+  );
+  formData.value = result.data;
   //将复选框的数据替换成对应的文字\
   if (formData.value.zjjy != null) {
     changeValue(formData.value.zjjy);
@@ -400,16 +435,20 @@ const initFormData = async () => {
 
   //字典
   formData.value.sexText = getDictLabel(DICT_TYPE.SEX_TYPE, formData.value.sex);
-  formData.value.postText = getDictLabel(DICT_TYPE.POST_TYPE, formData.value.ypgw);
-  formData.value.djcdText = getDictLabel(DICT_TYPE.ABILITY_LEVEL, formData.value.djcd);
-
-}
-
+  formData.value.postText = getDictLabel(
+    DICT_TYPE.POST_TYPE,
+    formData.value.ypgw
+  );
+  formData.value.djcdText = getDictLabel(
+    DICT_TYPE.ABILITY_LEVEL,
+    formData.value.djcd
+  );
+};
 
 /** 初始化 */
 onMounted(() => {
-  initFormData()
-})
+  initFormData();
+});
 </script>
 
 <style lang="scss" scoped>

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyServiceImpl.java

@@ -1042,6 +1042,38 @@ public class UseMoneyServiceImpl implements UseMoneyService {
     @Override
     public List<UseMoneyRespVO> getListByContractId(String contractId) {
         List<UseMoneyDO> result = useMoneyDao.getListByContractId(contractId);
-        return UseMoneyConvert.INSTANCE.convertList(result);
+        List<UseMoneyRespVO> resultList = UseMoneyConvert.INSTANCE.convertList(result);
+        resultList.forEach(useMoneyRespVO -> {
+            Integer isAgent = useMoneyRespVO.getIsAgent();
+            //不是代办项目
+            if (0 == isAgent) {
+                Project projectList = projectService.selectById(useMoneyRespVO.getProjectId());
+                //Project projectDO = projectList.stream().filter(project -> project.getId().equals(useMoneyRespVO.getProjectId())).findFirst().get();
+                if(projectList!=null){
+                    useMoneyRespVO.setProjectName(projectList.getXmmc());
+                    useMoneyRespVO.setProjectDeptName(projectList.getZrbm());
+                }
+            }else{
+                List<UseMoneyDetailDO> detailList=useMoneyDetailService.getListByUseMoeneyId(useMoneyRespVO.getId());
+                String xmmc="";
+                for(UseMoneyDetailDO detail:detailList){
+                    if(detail.getProjectId()!=null){
+                        Project projectList = projectService.selectById(detail.getProjectId());
+                        if(projectList!=null){
+                            xmmc+="，"+projectList.getXmmc();
+                        }
+                    }
+                }
+                useMoneyRespVO.setProjectName(xmmc.length() > 1 ? xmmc.substring(1) : xmmc);
+            }
+            Integer flowStatus = useMoneyRespVO.getFlowStatus();
+            if (FLOW_FINISHED == flowStatus) {
+                useMoneyRespVO.setStatus("已付");
+            }
+            if (FLOW_PAYMENT == flowStatus) {
+                useMoneyRespVO.setStatus("未付款");
+            }
+        });
+        return resultList;
     }
 }

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/StaffApi.java

@@ -36,6 +36,10 @@ public interface StaffApi {
     @Operation(summary = "更新员工所在部门跟岗位")
     CommonResult<String> updateDeptPost(@Valid @RequestBody StaffDeptPostDTO dto);
 
+    @PostMapping(PREFIX + "/changeDept")
+    @Operation(summary = "更新员工所在部门跟岗位")
+    CommonResult<Integer> updateDept(@Valid @RequestBody StaffDeptPostDTO dto);
+
     @PostMapping(PREFIX + "generateNum")
     @Operation(summary = "生成员工工号")
     CommonResult<String> generateNum();

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/api/staff/StaffApiImpl.java

@@ -49,6 +49,18 @@ public class StaffApiImpl implements StaffApi {
         return success(recordsService.updateStaff(vo));
     }
 
+    @Override
+    public CommonResult<Integer> updateDept(StaffDeptPostDTO dto) {
+        //获取员工档案
+        RecordsRespVO vo = recordsService.getRecordDetail(dto.getUserId());
+
+        //修改档案
+        vo.setDeptId(dto.getDeptId());
+        vo.setDeptName(dto.getDeptName());
+        vo.setId(dto.getUserId());
+        return success(recordsService.updateStaffDept(vo));
+    }
+
     @Override
     public CommonResult<String> generateNum() {
         return success(recordsService.generateNum());

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/mysql/staff/RecordsMapper.java

@@ -21,4 +21,9 @@ public interface RecordsMapper extends BaseMapperX<StaffRecordSDO> {
         return selectList(new LambdaQueryWrapperX<StaffRecordSDO>()
                 .in(StaffRecordSDO::getUserId, ids));
     }
+
+    default int updateByUserId(StaffRecordSDO entity){
+        return update(entity,new LambdaQueryWrapperX<StaffRecordSDO>()
+                .eq(StaffRecordSDO::getUserId, entity.getUserId()));
+    }
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/job/workday/WorkdayJob.java

@@ -0,0 +1,13 @@
+package com.zjugis.module.adm.job.workday;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author 陈俊
+ * @Date 2024/11/14 11:16
+ * @Version 1.0
+ */
+@Component
+public class WorkdayJob {
+
+}

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsService.java

@@ -75,4 +75,6 @@ public interface RecordsService {
     Integer updateContract(StaffRecordsDTO dto);
 
     String report(StaffReportDTO dto);
+
+    int updateStaffDept(RecordsRespVO vo);
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -529,6 +529,15 @@ public class RecordsServiceImpl implements RecordsService {
         return result.getCheckedData();
     }
 
+    @Override
+    public int updateStaffDept(RecordsRespVO vo) {
+        StaffRecordSDO entity = new StaffRecordSDO();
+        entity.setUserId(vo.getUserId());
+        entity.setDeptId(vo.getDeptId());
+        entity.setDeptName(vo.getDeptName());
+        return recordsMapper.updateByUserId(entity);
+    }
+
     private UserBaseDTO initUser(StaffRecordSDO staffRecordSDO) {
         UserBaseDTO dto = new UserBaseDTO();
         dto.setUsername(staffRecordSDO.getLoginName());

zjugis-module-system/zjugis-module-system-biz/pom.xml

@@ -40,6 +40,11 @@
             <artifactId>zjugis-module-infra-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.zjugis.cloud</groupId>
+            <artifactId>zjugis-module-adm-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <!-- 业务组件 -->
         <dependency>

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/framework/rpc/config/RpcConfiguration.java

@@ -1,10 +1,11 @@
 package com.zjugis.module.system.framework.rpc.config;
 
+import com.zjugis.module.adm.api.staff.StaffApi;
 import com.zjugis.module.infra.api.file.FileApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = FileApi.class)
+@EnableFeignClients(clients = {FileApi.class, StaffApi.class})
 public class RpcConfiguration {
 }

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/user/AdminUserServiceImpl.java

@@ -12,6 +12,8 @@ import com.zjugis.framework.common.util.collection.CollectionUtils;
 import com.zjugis.framework.datapermission.core.util.DataPermissionUtils;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.web.core.util.WebFrameworkUtils;
+import com.zjugis.module.adm.api.staff.StaffApi;
+import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import com.zjugis.module.infra.api.file.FileApi;
 import com.zjugis.module.system.api.user.dto.UserBaseDTO;
 import com.zjugis.module.system.api.user.dto.UserUpdateDTO;
@@ -95,6 +97,8 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Resource
     private FileApi fileApi;
+    @Resource
+    private StaffApi staffApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -130,6 +134,11 @@ public class AdminUserServiceImpl implements AdminUserService {
         // 更新用户
         AdminUserDO updateObj = UserConvert.INSTANCE.convert(reqVO);
         userMapper.updateById(updateObj);
+        StaffDeptPostDTO dto = new StaffDeptPostDTO();
+        dto.setUserId(reqVO.getId());
+        dto.setDeptName(reqVO.getDeptName());
+        dto.setDeptId(reqVO.getDeptId());
+        staffApi.updateDept(dto).getCheckedData();
         // 更新岗位
         updateUserPost(reqVO, updateObj);
     }