|
@@ -6,6 +6,7 @@ import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.tenant.TenantContextHolder;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -26,7 +27,9 @@ public class SysEmployeePositionController extends BaseController {
|
|
|
@GetMapping("/findOrganPosition")
|
|
|
@PreAuthorize("@pcs.hasPermissions('employeePosition/findOrganPosition')")
|
|
|
public Object findAll(String organIds) throws Exception {
|
|
|
- organIds = organizationService.getEmployeeOrgan(organIds);
|
|
|
+ if(StringUtils.isEmpty(organIds)){
|
|
|
+ organIds = organizationService.getEmployeeOrgan(organIds);
|
|
|
+ }
|
|
|
Integer tenantId = TenantContextHolder.getTenantId();
|
|
|
return succeed(employeePositionService.findOrganPosition(organIds, tenantId));
|
|
|
}
|