bug

jiangping

2023-12-06 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5

 server/src/main/java/doumeemes/api/ext/DeviceExtController.java

@@ -3,6 +3,7 @@
import doumeemes.api.BaseController;
import doumeemes.core.annotation.excel.ExcelExporter;
import doumeemes.core.annotation.pr.PreventRepeat;
import doumeemes.core.annotation.trace.Trace;
import doumeemes.core.model.ApiResponse;
import doumeemes.core.model.PageWrap;
import doumeemes.core.model.PageData;
@@ -40,6 +41,7 @@
@RestController
@RequestMapping("/ext/deviceExt")
@Api(tags = "生产设备信息接口")
@Trace(withRequestResult = false,withRequestParameters = false)
public class DeviceExtController extends BaseController {

    @Autowired
@@ -128,11 +130,11 @@

        }

        QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
        Device queryDeviceExtDTO=new Device();
        queryDeviceExtDTO.setDeleted(Constants.ZERO);
        queryDeviceExtDTO.setCode(device.getCode());
        queryDeviceExtDTO.setRootDepartId(getLoginUser().getRootDepartment().getId());
        List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
        List<Device> list= deviceService.findList(queryDeviceExtDTO);
        if(list.size()>0){
            if(!Constants.equalsInteger(list.get(0).getId(),device.getId())){
                return ApiResponse.failed("设备编码，不允许添加");
@@ -166,6 +168,10 @@
        deviceService.updateById(find);
        if(StringUtils.isNotBlank(device.getUserIds())){
            deviceService.dealDeviceUserId(Constants.ONE,device.getUserIds(),device.getId(),getLoginUser());
        }else {
            UserDevice userDevice = new UserDevice();
            userDevice.setDeviceId(device.getId());
            userDeviceService.delete(userDevice);
        }

        return ApiResponse.success(null);