Merge remote-tracking branch 'origin/master'

renkang

2025-01-03 ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java

@@ -1,6 +1,5 @@
package com.doumee.cloud.admin;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.api.BaseController;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -37,7 +36,7 @@
    @Autowired
    private CompanyService companyService;

    @Autowired
//    @Autowired
    private ERPSyncService erpSyncService;
    @Autowired
    private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@@ -123,6 +122,12 @@
    public ApiResponse<List<Company>> list (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(companyService.findList(company));
    }
    @ApiOperation("新建合同所属公司筛选")
    @PostMapping("/listForConstract")
    @CloudRequiredPermission("business:company:query")
    public ApiResponse<List<Company>> listForConstract (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(companyService.listForConstract(company));
    }



@@ -151,6 +156,7 @@
    @PostMapping("/updateStatusById")
    @CloudRequiredPermission("business:company:update")
    public ApiResponse updateStatusById(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        company.setLoginUserInfo(getLoginUser(token));
        companyService.updateStatusById(company);
        return ApiResponse.success(null);
    }