bug修复

src/main/java/com/yihu/hos/system/controller/UserController.java

@@ -140,7 +140,8 @@ public class UserController extends BaseController {
            obj.setPassword(DigestUtils.md5Hex(password + saltValu));
            return userManager.addUser(obj);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
            ex.printStackTrace();
            return Result.error("新增用户异常，异常信息：\n"+ex.getMessage());
        }
    }
@@ -157,7 +158,7 @@ public class UserController extends BaseController {
            return userManager.updateUser(obj);
        } catch (Exception ex) {
            ex.printStackTrace();
            return Result.error(ex.getMessage());
            return Result.error("修改用户异常，异常信息：\n"+ex.getMessage());
        }
    }
@@ -170,7 +171,9 @@ public class UserController extends BaseController {
        try {
            return userManager.activityUser(userid, flag);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
            ex.printStackTrace();
            return Result.error("修改菜单状态异常，异常信息：\n"+ex.getMessage());
        }
    }
@@ -184,7 +187,8 @@ public class UserController extends BaseController {
            String userid = request.getParameter("userid");
            return userManager.resetPassword(userid);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
            ex.printStackTrace();
            return Result.error("密码异常，异常信息：\n"+ex.getMessage());
        }
    }
    /**
@@ -224,7 +228,9 @@ public class UserController extends BaseController {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
            ex.printStackTrace();
            return Result.error("修改密码异常，异常信息：\n"+ex.getMessage());
        }
    }
@@ -237,7 +243,8 @@ public class UserController extends BaseController {
        try {
            return userManager.deleteUser(userid);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
            ex.printStackTrace();
            return Result.error("用户删除异常，异常信息：\n"+ex.getMessage());
        }
    }
@@ -249,7 +256,8 @@ public class UserController extends BaseController {
        try {
            return userManager.userRoleDistribute(userId,roleId);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
            ex.printStackTrace();
            return Result.error("角色分配异常，异常信息：\n"+ex.getMessage());
        }
    }
}

src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJob.jsp

@@ -112,7 +112,7 @@
            </div>
        </div>
        <div class="m-form-group">
            <label>任务开始执行时间：</label>
            <label>任务触发时间：</label>
            <div class="m-form-control">
                <input id="dateNextTime" type="text" id="jobNextTime" />
            </div>

src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJobJs.jsp

@@ -8,7 +8,7 @@
        flowTempId:0,
        flowArrays:[],
        beforeServeTime:false,
        archiveUpload:"0",
        archiveCollect:"0",
        crawlerFlowUpload:"1",
        $form:$("#div_form"),
        $listPlan:null,//适配方案列表
@@ -585,7 +585,7 @@
                    //下次执行时间不能为空
                    if(data.jobNextTime == null || data.jobNextTime == 0)
                    {
                        $.ligerDialog.error("请输入任务开始执行时间！");
                        $.ligerDialog.error("请输入任务触发时间！");
                        return false;
                    }
@@ -603,12 +603,12 @@
                    }
                    //档案上传接口值校验
                    if($('input[name="jobContentType"]').ligerComboBox("getValue")==me.archiveUpload)
                    if($('input[name="jobContentType"]').ligerComboBox("getValue")==me.crawlerFlowUpload)
                    {
                        if(data.jobType == "0") {
                            if($("#repeatStartTime").ligerDateEditor("getValue")==""&&$("#repeatEndTime").ligerDateEditor("getValue")=="")
                            {
                                $.ligerDialog.error("请输采集时间！");
                                $.ligerDialog.error("请输采集上传时间！");
                                return false;
                            }
                        }
@@ -624,7 +624,7 @@
                    }
                    if(data.jobContent == null || data.jobContent.length==0)
                    {
                        $.ligerDialog.error("请输入任务内容！");
                        $.ligerDialog.error("请选择关联的流程！");
                        return false;
                    }
                    return true;
@@ -659,7 +659,7 @@
                        }
                        //判断是否设置轮询字段和字段类型   档案上传不校验 @modify by cyj
                        if($('input[name="jobContentType"]').ligerComboBox("getValue")!=me.archiveUpload) {
                        if($('input[name="jobContentType"]').ligerComboBox("getValue")!=me.archiveCollect) {
                            var selected = me.$listDataset.getSelectedRows();
                            for(var i=0;i<selected.length;i++)
                            {

src/main/webapp/WEB-INF/ehr/jsp/system/flow/editorFlowJs.jsp

@@ -194,7 +194,7 @@
                        '<div class="l-text"><input type="text" id="type' + index + '" class="l-text-field required" name="type"></div>' +
                        '</div></div>';
                html += '<div class="m-form-group" style="border:1px solid #e1e1e1"><label>包名' + index + ' : </label><div class="m-form-control"  controlType="textbox" id="packName' + index + '_div" style="margin-left:0px;">' +
                html += '<div class="m-form-group" ><label>包名' + index + ' : </label><div class="m-form-control"  controlType="textbox" id="packName' + index + '_div" style="margin-left:0px;">' +
                        '<input type="text" id="packageName' + index + '"  class="l-textbox"/></div></div>';
                html += '<div class="m-form-group"   dataIndex="' + index + '" id="paramGroup' + index + '"><label>类名' + index + ' :</label>' +
@@ -223,7 +223,7 @@
                var type = $("#type" + index).val();
                if (!type || type == '') {
                    type = "route";
                    type = "processor";
                }
                liger.get("type" + index).selectValue(type);
@@ -332,7 +332,7 @@
                            '<div class="l-text"><input type="text" id="type' + index + '" value="' + data.type + '" class="l-text-field required" name="type"></div>' +
                            '</div></div>';
                    html += '<div class="m-form-group" style="border:1px solid #e1e1e1"><label>包名' + index + ' : </label><div class="m-form-control"  controlType="textbox" id="packName' + index + '_div" style="margin-left:0px;">' +
                    html += '<div class="m-form-group" ><label>包名' + index + ' : </label><div class="m-form-control"  controlType="textbox" id="packName' + index + '_div" style="margin-left:0px;">' +
                            '<input type="text" name="packageName" id="packageName' + index + '" value="' + data.packageName + '" class="l-textbox"/></div></div>';
                    html += '<div class="m-form-group"   dataIndex="' + index + '" id="paramGroup' + index + '"><label>' +