fix: 工作日志bug fix

src/main/java/com/hz/employmentsite/controller/taskAndLog/DoWorkController.java

@@ -3,7 +3,10 @@ package com.hz.employmentsite.controller.taskAndLog;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
+import com.hz.employmentsite.mapper.PcSiteMapper;
 import com.hz.employmentsite.mapper.PcSiteUserMapper;
+import com.hz.employmentsite.model.PcSite;
+import com.hz.employmentsite.model.PcSiteExample;
 import com.hz.employmentsite.model.PcSiteUserExample;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
@@ -28,6 +31,9 @@ public class DoWorkController {
     @Autowired
     private PcSiteUserMapper pcSiteUserMapper;
 
+    @Autowired
+    private PcSiteMapper pcSiteMapper;
+
     @Autowired
     private ExcelHelper excelHelper;
 
@@ -61,9 +67,18 @@ public class DoWorkController {
             PcSiteUserExample.Criteria siteUserCro = siteUserExp.createCriteria();
             siteUserCro.andUserIDEqualTo(accountService.getLoginUserID());
             var curSiteUserInfo = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
-            if(curSiteUserInfo != null){
+            if (curSiteUserInfo != null) {
                 data.siteUserID = curSiteUserInfo.getSiteUserID();
                 data.userId = curSiteUserInfo.getUserID();
+                // 查询提交用户的所属驿站，获取区县与街道编码
+                PcSiteExample siteExample = new PcSiteExample();
+                PcSiteExample.Criteria siteExampleCriteria = siteExample.createCriteria();
+                siteExampleCriteria.andSiteIDEqualTo(curSiteUserInfo.getSiteID());
+                PcSite pcSites = pcSiteMapper.selectByExample(siteExample).stream().findFirst().orElse(null);
+                if (pcSites != null) {
+                    data.setRegionCode(pcSites.getRegionCode());
+                    data.setStreetCode(pcSites.getStreetCode());
+                }
             }
         }
         return RespGenerstor.success(data);

vue/src/views/taskAndLog/dowork/edit.vue

@@ -7,8 +7,8 @@
           <a-form-item label="姓名" name="userId" :label-col="{span:7}"
                        :rules="[{ required: true, message: '请选择站点人员!' }]">
             <label v-if="opCategory==3">{{dataModel.userName}}</label>
-            <a-select ref="select"   show-search optionFilterProp="label"
-                      v-model:value="dataModel.userId"
+            <a-select ref="select" show-search optionFilterProp="label"
+                      v-model:value="dataModel.userId" :disabled="userInfo.userTypeID == 3"
                       :allow-clear="true" @change="siteUserChange">
               <a-select-option v-for="item in siteUserList" :label="item.text" :value="item.value" :key="item.value">
                 <span>{{ item.text }}</span>
@@ -36,6 +36,7 @@
           <a-form-item label="所属县区"  name="regionCode" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属县区!' }]">
             <label v-if="opCategory==3">{{dataModel.regionCode}}</label>
             <a-select ref="select" v-model:value="dataModel.regionCode" :options="regionList"
+                      :disabled="userInfo.userTypeID == 3"
                       :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" @change="regionChange()" ></a-select>
           </a-form-item>
         </a-col>

vue/src/views/taskAndLog/dowork/index.vue

@@ -205,6 +205,7 @@ export default defineComponent({
       },
       {title: '日志类型', dataIndex: 'logTypeName', key: 'logTypeName', align: "center"},
       {title: '工作情况', dataIndex: 'workContent', key: 'workContent', align: "center"},
+      {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', align: "center"},
       {title: '所属县区', dataIndex: 'regionName', key: 'regionName', align: "center"},
       {title: '所属街道', dataIndex: 'streetName', key: 'streetName', align: "center"},
       {title: '走访企业数量', dataIndex: 'RecordsCompanyNum', key: 'RecordsCompanyNum', align: "center"},