公告修改

src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java

@@ -363,7 +363,7 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
                 return "流程审批人不能为空,办公室岗位下无用户,请联系管理员！";
             }
             variables.put("zjlCount",zjlList.size());
-            processType = "newOaNotify";
+            processType = "oaNotify";
             users.addAll(zjlList);
         }
         List<String> userIds = new ArrayList<>(users.size());
@@ -664,7 +664,7 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
             selectProcess.setProcessInstanceId(oaNotify.getProcessInstanceId());
             List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
             List<Activity> activities = workActivityMenu.getActivities();
-            if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newOaNotify")) {
+            if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("oaNotify")) {
                 key = 1;
                 for (int i = 0; i < workActivityProcesses.size(); i++) {
                     WorkActivityProcess activityProcess = workActivityProcesses.get(i);
@@ -709,7 +709,7 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
                     }
                 }
             } else {
-                workActivityMenu.setProcessType("newOaNotify");
+                workActivityMenu.setProcessType("oaNotify");
                 for (int i = 0; i < workActivityProcesses.size(); i++) {
                     WorkActivityProcess activityProcess = workActivityProcesses.get(i);
                     String count = activityProcess.getCount() + "";
@@ -749,7 +749,7 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
             oaNotify.preUpdate();
             // 提交流程任务
             vars.put(exp, "yes".equals(oaNotify.getAct().getFlag()) ? true : false);
-            vars.put("passs", true);
+            vars.put("passs",true);
             workActivityProcessService.updateProcess(workActivityProcess,workActivityMenu,key,taskCount, oaNotify.getProcessInstanceId(),taskDefKey,"modifyApply", oaNotify.getAct().getFlag(),comment, activities);
             // 提交流程任务
             actTaskService.complete(oaNotify.getAct().getTaskId(), oaNotify.getAct().getProcInsId(), oaNotify.getAct().getComment(), vars);
@@ -796,7 +796,7 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
                 }
                 workActivityProcessService.deleteProcessIdAuditUsers(oaNotify.getProcessInstanceId());
             } else {
-                if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newOaNotify")) {
+                if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("oaNotify")) {
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(oaNotify.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2855,7 +2855,7 @@ public class WorkProjectNotifyController extends BaseController {
 			List<Task> taskList = actTaskService.getCurrentTaskList(processInstance);
 			if(taskList!=null && taskList.size()>1){
 				for (Task taskInfok:taskList) {
-					if (taskInfok.getAssignee().equals(UserUtils.getUser().getId())) {
+					if (UserUtils.getUser().getId().equals(taskInfok.getAssignee())) {
 						act.setTaskId(taskInfok.getId());
 						act.setTaskName(taskInfok.getName());
 						act.setTaskDefKey(taskInfok.getTaskDefinitionKey());

src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -19,6 +19,13 @@
                 parent.layer.msg('公告内容不能为空',{icon:5});
                 return false;
             }
+            var startDate = new Date($("#startDate").val());
+            var endDate = new Date($("#endDate").val());
+
+            if(startDate.getTime() > endDate.getTime()){
+                parent.layer.msg("开始日期不得大于结束日期!", {icon: 5});
+                return false;
+            }
             if(validateForm.form()){
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/oa/oaNotify/tstore");

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -17,6 +17,13 @@
                 parent.layer.msg('公告内容不能为空',{icon:5});
                 return false;
             }
+            var startDate = new Date($("#startDate").val());
+            var endDate = new Date($("#endDate").val());
+
+            if(startDate.getTime() > endDate.getTime()){
+                parent.layer.msg("开始日期不得大于结束日期!", {icon: 5});
+                return false;
+            }
             if(validateForm.form()){
                 $("#inputForm").submit();
                 return true;

src/main/webapp/webpage/modules/workReimbursementType/reimbursementTypeList.jsp

@@ -56,9 +56,9 @@
 			<div class="full-width fl">
 				<div class="contentShadow layui-form contentDetails">
 					<div class="nav-btns">
-						<shiro:hasPermission name="reimbursementType:reimbursementType:add">
+						<%--<shiro:hasPermission name="reimbursementType:reimbursementType:add">
 							<table:addRow url="${ctx}/reimbursementType/reimbursementType/form" title="项目"></table:addRow><!-- 增加按钮 -->
-						</shiro:hasPermission>
+						</shiro:hasPermission>--%>
 						<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
 						<div style="clear: both;"></div>
 					</div>