机车 终端修改

business-service/src/main/java/com/ozs/service/impl/BaseTerminalServiceImpl.java

@@ -89,18 +89,21 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
     }
 
     @Override
-    public AjaxResult vehicleTerminalUpdate(BaseTerminal baseVehicleTerminal, String userId) {
+    public AjaxResult vehicleTerminalUpdate(BaseTerminal baseTerminal, String userId) {
         LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<BaseTerminal>();
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
-            wrapper.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
+        if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
+            wrapper.eq(BaseTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+        }
+        if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getId())) {
+            wrapper.ne(BaseTerminal::getTerminalCode, baseTerminal.getId());
         }
         List<BaseTerminal> baseVehicles = baseTerminalMapper.selectList(wrapper);
         if (baseVehicles.size() > 0) {
             return AjaxResult.error("机车编码已存在！");
         }
-        baseVehicleTerminal.setUpdateBy(userId);
-        baseVehicleTerminal.setUpdateTime(new Date());
-        int update = baseTerminalMapper.updateById(baseVehicleTerminal);
+        baseTerminal.setUpdateBy(userId);
+        baseTerminal.setUpdateTime(new Date());
+        int update = baseTerminalMapper.updateById(baseTerminal);
         if (update > 0) {
             return AjaxResult.success();
         } else {