Merge branch 'hy-tobacco' of http://132.232.112.242:7090/zhangkb/indicators into hy-tobacco

src/main/java/com/keymobile/indicators/api/hytobacco/IndicatorsDefCtrl.java

@@ -98,10 +98,10 @@ public class IndicatorsDefCtrl {
 	
 	@ApiOperation(value = "新建考核指标(isUpdate:0 新增  1修改)", notes = "新建考核指标(isUpdate:0 新增  1修改)")
 	@PostMapping(value = "/createDriveInd")
-	public void createDriveInd(@RequestBody DriveIndDef driveIndDef,@RequestParam String code,@RequestParam Integer catalogId,
+	public String createDriveInd(@RequestBody DriveIndDef driveIndDef,@RequestParam String code,@RequestParam Integer catalogId,
 			@RequestParam String catalogIdPath,@RequestParam String user,@RequestParam String isUpdate,
 				@RequestParam(required=false) String shortboardIds) throws Exception{
-		driveIndDefService.saveOrUpdate(driveIndDef, code, catalogId, catalogIdPath, user, isUpdate, shortboardIds);
+		return driveIndDefService.saveOrUpdate(driveIndDef, code, catalogId, catalogIdPath, user, isUpdate, shortboardIds);
 	}
 	
 	@ApiOperation(value = "删除考核指标", notes = "删除考核指标")

src/main/java/com/keymobile/indicators/service/hytobacco/DriveIndDefService.java

@@ -45,7 +45,7 @@ public class DriveIndDefService {
 		}
 		if("0".equals(isUpdate)) {//新建
 			DriveIndDef dbDriveIndDef = this.getById(driveIndDef.getIndId());
-			if(dbDriveIndDef==null) {
+			if(dbDriveIndDef!=null) {
 				return "indId is exist,create drive indicators fail";
 			}else {
 				driveIndDef.setCreater(user);