Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

 server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java

@@ -12,6 +12,7 @@
import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.service.business.CompanyService;
import com.doumee.service.business.ERPSyncService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -36,6 +37,9 @@

    @Autowired
    private CompanyService companyService;

    @Autowired
    private ERPSyncService erpSyncService;

    @PreventRepeat
    @ApiOperation("新建")
@@ -150,7 +154,7 @@
     */
    @ApiOperation("根据类型查询组织信息")
    @GetMapping("/findCompanyTreePage")
//    @RequiresPermissions("business:company:query")
    @RequiresPermissions("business:company:query")
    public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
        return ApiResponse.success(companyService.findCompanyTreePage(type));
    }
@@ -159,9 +163,9 @@

    @ApiOperation("部门信息同步")
    @PostMapping("/sync")
//    @RequiresPermissions("business:company:sync")
    @RequiresPermissions("business:company:sync")
    public ApiResponse sync(){
        //TODO 手动同步 部门信息
        erpSyncService.syncCompany(null);
        return ApiResponse.success("同步成功");
    }
}