Merge branch 'dev' of git.yfzx.zjtys.com.cn:matrix/device-back

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -785,7 +785,7 @@ public class RepairController {
                     //存装备日志
 //                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList, taskBto.getId());
                     DeviceLogDto deviceLogDto;
-                    if (repairReceiveVo.getRightSignatureId() != null && "".equals(repairReceiveVo.getRightSignatureId())){
+                    if (repairReceiveVo.getRightSignatureId() != null && !"".equals(repairReceiveVo.getRightSignatureId())){
                          deviceLogDto = new DeviceLogDto(id, "接收并发起入库(签章入库)", fileVoList, taskBto.getId(),taskBto.getId());
                     }
                      deviceLogDto = new DeviceLogDto(id, "接收并发起入库(签字入库)", fileVoList, taskBto.getId(),taskBto.getId());

dev-union/src/main/java/com/tykj/dev/union/RunController.java

@@ -53,6 +53,9 @@ public class RunController {
     @Autowired
     private MatchingDeviceLibraryService matchingDeviceLibraryService;
 
+    @Autowired
+    DataInit dataInit;
+
     @ApiOperation(value = "修改单位名称从而修改配套设备的创建单位", notes = "修改单位名称从而修改配套设备的创建单位")
     @PostMapping("/device/updateDeviceLocationAndOwnUnit")
     @Transactional(rollbackFor = Exception.class)
@@ -73,5 +76,13 @@ public class RunController {
         return ResponseEntity.ok("修改成功");
     }
 
+    @ApiOperation(value = "修改单位名称从而修改配套设备的创建单位", notes = "修改单位名称从而修改配套设备的创建单位")
+    @GetMapping("/run/init")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity<String> run() {
+        dataInit.init2();
+        return ResponseEntity.ok("修改成功");
+    }
+
 
 }