Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java

@@ -109,7 +109,7 @@ public class SysTaskPlanController extends CoreBaseController{
             LOGGER.info("定时任务唯一校验 Name:{0}，GroupName:{1}", sysTaskPlan.getName(), sysTaskPlan.getGroupName());
             BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd())
                                                     .checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
-            if(baseResultBean.isSuccess()){
+            if(baseResultBean.isSuccess() && baseResultBean.getResultObject() != null && ( boolean ) baseResultBean.getResultObject()){
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                         .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
@@ -161,6 +161,10 @@ public class SysTaskPlanController extends CoreBaseController{
     @ApiOperation(value = "修改任务计划", notes = "任务计划")
     public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) {
         try {
+            ResultBean resultBean = ResultBean.success("操作成功")
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setResultObject(sysTaskPlan)
+                    .build();
             // 数据校验
             ValidatorBean.beginValid(sysTaskPlan)
                     .notNull("name", sysTaskPlan.getName())
@@ -194,11 +198,7 @@ public class SysTaskPlanController extends CoreBaseController{
                         .setErrorDetail("定时任务不存在")
                         .build();
             } else if(!baseResultBean.isSuccess()) {
-                throw ImppExceptionBuilder.newInstance()
+                resultBean = ResultBean.fail(baseResultBean.getErrorMsg());
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode())
-                        .setErrorDetail(baseResultBean.getErrorMsg())
-                        .build();
             }
 
             // 修改对应模块中的定时任务
@@ -207,11 +207,9 @@ public class SysTaskPlanController extends CoreBaseController{
                     .editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(),
                             sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam());
             if(!baseResultBean.isSuccess()){
-                throw ImppExceptionBuilder.newInstance()
+                resultBean = ResultBean.fail(baseResultBean.getErrorMsg());
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+            } else {
-                        .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode())
+
-                        .setErrorDetail(baseResultBean.getErrorMsg())
-                        .build();
             }
 
             // 是否立即执行
@@ -219,14 +217,10 @@ public class SysTaskPlanController extends CoreBaseController{
                 baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),
                         sysTaskPlan.getGroupName());
                 if(!baseResultBean.isSuccess()){
-                    throw ImppExceptionBuilder.newInstance()
+                    resultBean = ResultBean.fail(baseResultBean.getErrorMsg());
-                            .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                            .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode())
-                            .setErrorDetail(baseResultBean.getErrorMsg())
-                            .build();
                 }
             }
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan);
+            return resultBean;
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java

@@ -55,7 +55,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
                     .setErrorSolution("请检查打印模板")
                     .build();
         }
-
+        sysLabelTemplate.setOrganizeCode(AuthUtil.getSessionUser().getUserInfo().getOrganize().getOrganizeCode());
         SysLabelTemplate insertResult = sysLabelTemplateRDao.insert(sysLabelTemplate);
         // 新增打印模板成功
         if (insertResult != null) {
@@ -71,6 +71,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
                     templateParam.setTemplateId(insertResult.getId());
                     templateParam.setTemplateParam(paramItem);
                     templateParam.setTemplateParamText(paramItem);
+                    templateParam.setOrganizeCode(AuthUtil.getSessionUser().getUserInfo().getOrganize().getOrganizeCode());
                     ConvertBean.serviceModelInitialize(templateParam, AuthUtil.getSessionUser().getUserName());
                     sysLabelTemplateParamRDao.insert(templateParam);
                 }