功能完善

liuhaonan

2021-12-02 34768217f342b700f2da6c3be6df13465c68ab3b

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

ÎļþÃû´Ó ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java ÐÞ¸Ä
@@ -12,7 +12,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("v1/client")
public class ClientCollector {
public class ClientController {

    private final ClientService clientService;

@@ -50,24 +50,22 @@

    @PostMapping("/list")
    public ResponseVO<Object> listClient(){
        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 ä¸ºç®¡ç†å‘˜
        if(administratorIdentity==0){//判断 å¦‚果是管理员 å°±åˆ¤æ–­ä¸‹CustomerInspectContextHolder.getCustomerId() æœ‰æ²¡æœ‰å€¼
            Long customerId = CustomerInspectContextHolder.getCustomerId();
       // Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 ä¸ºç®¡ç†å‘˜
     /*   if(administratorIdentity==0){//判断 å¦‚果是管理员 å°±åˆ¤æ–­ä¸‹CustomerInspectContextHolder.getCustomerId() æœ‰æ²¡æœ‰å€¼
           // Long customerId = CustomerInspectContextHolder.getCustomerId();
            if(customerId!=null){
                return ResponseUtil.success(clientService.list());
            }
            return ResponseUtil.success(clientService.list());
        }else {
            return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
        }
/*
        Long customerId = CustomerInspectContextHolder.getCustomerId();
        if (customerId!=null){
            return ResponseUtil.success(clientService.list());
        }else {
            //return ResponseUtil.success(clientService.list());
            return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));

        }*/
        if(SecurityUtils.getClientId().equals(SecurityUtils.getAdministratorIdentity())) {
            return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
            //   }else if("0".equals(SecurityUtils.getAdministratorIdentity())){
        }else {
            return ResponseUtil.success(clientService.list());
        }

    }
}