合同模块权限修改

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -22,10 +22,12 @@ import com.jeeplus.modules.contractclient.service.WorkContractClientService;
 import com.jeeplus.modules.isignature.service.ISignatureDocumentService;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.dao.RoleDao;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.RoleActivityEnname;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.dao.WorkActivityProcessDao;
@@ -342,7 +344,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		if (StringUtils.isNotBlank(workContractInfo.getTotalContractIds())){
 			workContractInfo.setTotalContractIds(","+workContractInfo.getTotalContractIds()+",");
 		}
-		workContractInfo.getSqlMap().put("dsf", dataScopeFilter(workContractInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+		String companyId = UserUtils.getUser().getComId();
+//		workContractInfo.getSqlMap().put("dsf", dataScopeFilter(workContractInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+		workContractInfo.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
 		int count = dao.queryCount(workContractInfo);
 		page.setCount(count);
 		page.setCountFlag(false);
@@ -378,7 +382,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		if (StringUtils.isNotBlank(workContractInfo.getTotalContractIds())){
 			workContractInfo.setTotalContractIds(","+workContractInfo.getTotalContractIds()+",");
 		}
-		workContractInfo.getSqlMap().put("dsf", dataScopeFilter(workContractInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+        String companyId = UserUtils.getUser().getComId();
+//		workContractInfo.getSqlMap().put("dsf", dataScopeFilter(workContractInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+        workContractInfo.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
 		workContractInfo.setPage(page);
 		List<WorkContractInfo> list = Lists.newArrayList();
 		List<WorkContractInfo> workContractInfos = workContractInfoDao.afindList(workContractInfo);
@@ -390,7 +396,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		if (StringUtils.isNotBlank(workContractInfo.getTotalContractIds())){
 			workContractInfo.setTotalContractIds(","+workContractInfo.getTotalContractIds()+",");
 		}
-		workContractInfo.getSqlMap().put("dsf", dataScopeFilter(workContractInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+//		workContractInfo.getSqlMap().put("dsf", dataScopeFilter(workContractInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+        String companyId = UserUtils.getUser().getComId();
+        workContractInfo.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
 		workContractInfo.setPage(page);
 		List<WorkContractInfo> list = Lists.newArrayList();
 		List<WorkContractInfo> workContractInfos = workContractInfoDao.ifindList(workContractInfo);
@@ -576,8 +584,16 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	public String save(WorkContractInfo workContractInfo,Map<String, Object> variables, String contextPath,String urls) {
 		long begin = System.currentTimeMillis();
 		String processInstanceId = workContractInfo.getProcessInstanceId();
+		String contractTypeCode = workContractInfo.getContractTypeDoc();
+		String contractType = "";
+		List<MainDictDetail> list1 = DictUtils.getMainDictList("contract_info_type");
+		for(MainDictDetail mainDictDetail:list1){
+			if(mainDictDetail.getValue().equals(contractTypeCode)){
+				  contractType = mainDictDetail.getLabel();
+			}
+		}
 		if (StringUtils.isBlank(workContractInfo.getContractNum())) {
-			workContractInfo.setContractNum(serialNumTplService.genSerialNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_BIZCODE));
+			workContractInfo.setContractNum(serialNumTplService.genSerialNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_BIZCODE).replace("TYPE",contractType));
 			long end2 = System.currentTimeMillis();
 			logger.info("合同送审-项目编码设置任务结束，共耗时：[" + (end2-begin) / 1000 + "]秒");
 		}

src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -110,7 +110,9 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 	}
 	
 	public Page<WorkContractRecord> findPage(Page<WorkContractRecord> page, WorkContractRecord workContractRecord) {
-		workContractRecord.getSqlMap().put("dsf", dataScopeFilter(workContractRecord.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACTRECORD.getValue()));
+//		workContractRecord.getSqlMap().put("dsf", dataScopeFilter(workContractRecord.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACTRECORD.getValue()));
+		String companyId = UserUtils.getUser().getComId();
+		workContractRecord.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
 		workContractRecord.setPage(page);
 		page.setList(findList(workContractRecord));
 		return page;

src/main/java/com/jeeplus/modules/workcontractsignature/service/WorkContractSignatureService.java

@@ -133,7 +133,9 @@ public class WorkContractSignatureService extends CrudService<WorkContractSignat
 	}
 	
 	public Page<WorkContractSignature> findPage(Page<WorkContractSignature> page, WorkContractSignature workContractSignature) {
-		workContractSignature.getSqlMap().put("dsf", dataScopeFilter(workContractSignature.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+//		workContractSignature.getSqlMap().put("dsf", dataScopeFilter(workContractSignature.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+		String companyId = UserUtils.getUser().getComId();
+		workContractSignature.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
 		workContractSignature.setPage(page);
 		page.setList(this.findList( workContractSignature));
 		return page;

src/main/webapp/webpage/modules/sys/gridselectreportrecord.jsp

@@ -68,6 +68,7 @@
 		<div class="commonQuery">
 			<div class="layui-item query athird">
 				<span class="layui-form-label">${searchLabel}：</span>
+				<%--<span class="layui-form-label">${fns:urlDecode(searchLabel)}：</span>--%>
 				<div class="layui-input-block">
 					<form:input path="name" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 				</div>

src/main/webapp/webpage/modules/sys/sysLogin.jsp

@@ -5,7 +5,7 @@
 <html>
 
 <head>
-	<link rel="icon" href="${ctxStatic}/common/img/bitbug_favicon.ico" type="image/x-icon"/>
+	<link rel="icon" href="${ctxp}/static/common/img/bitbug_favicon.ico" type="image/x-icon"/>
 	<meta name="description" content="User login page" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<script src="${ctxStatic}/jquery/jquery-2.1.1.min.js" type="text/javascript"></script>
@@ -535,7 +535,7 @@
 						<div style="width: 600px;float: left;">
 							<div class="login-title">
 								<%--<img src="${ctxStatic }/common/login/images/top-name1.png">--%>
-								<img src="${ctxp}/static/common/login/images/login_xg.jpg">
+								<img src="${ctxp}/static/common/login/images/top-name1.png">
 							</div>
 							<div style="height:300px;">
 								<div class="layui-carousel" id="banners" style="height:300px;">
@@ -639,13 +639,16 @@
 										<%--<br/>--%>
 
 										<div class="form-options option1 clearfix">
+                                            <div style="width: 20px;height: auto" class="pull-left">
+                                                &emsp13;
+                                            </div>
 											<div>
 												<a href="javascript:void(0)" data-target="#forgot-box" class="pull-left">
 													<font color="#428bca">
 														忘记密码</font>
 												</a>
 											</div>
-											<div style="width: 50px;height: auto" class="pull-left">
+											<div style="width: 150px;height: auto" class="pull-left">
 												&emsp13;
 											</div>
 											<div>
@@ -654,13 +657,16 @@
 														快速登录</font>
 												</a>
 											</div>
-
-											<div>
-												<a href="javascript:void(0)" data-target="#signup-box" class="pull-right user-signup-link">
-													<font color="#428bca">没有账号？注册
-													</font>
-												</a>
-											</div>
+                                            <%--<div style="width: 20px;height: auto" class="pull-left">--%>
+                                                <%--&emsp13;--%>
+                                            <%--</div>--%>
+
+											<%--<div>--%>
+												<%--<a href="javascript:void(0)" data-target="#signup-box" class="pull-right user-signup-link">--%>
+													<%--<font color="#428bca">没有账号？注册--%>
+													<%--</font>--%>
+												<%--</a>--%>
+											<%--</div>--%>
 										</div>
 									</div><!-- /.widget-main -->
 								</div><!-- /.widget-body -->