投标项目权限

src/main/java/com/jeeplus/modules/sys/utils/UserUtils.java

@@ -157,7 +157,7 @@ public class UserUtils {
                String loginName1 = workStaffBasicInfo.getMobile();
 				user1.setLoginName(loginName1);
 				user = userDao.getByLoginName(user1);
-			} else if(pattern.matcher(loginName).matches() || loginName.equals("admin")){
+			} else if(pattern.matcher(loginName).matches() || loginName.contains("admin")){
 				user1.setLoginName(loginName);
 				user = userDao.getByLoginName(user1);
 			}else {

src/main/java/com/jeeplus/modules/workbidproject/service/WorkBidProjectService.java

@@ -190,7 +190,9 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 	}
 
 	public Page<WorkBidProject> findPage(Page<WorkBidProject> page, WorkBidProject workBidProject) {
-		workBidProject.getSqlMap().put("dsf", dataScopeFilter(workBidProject.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_BID_PROJECT.getValue()));
+//		workBidProject.getSqlMap().put("dsf", dataScopeFilter(workBidProject.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_BID_PROJECT.getValue()));
+		String companyId = UserUtils.getUser().getComId();
+		workBidProject.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
 		int count = dao.queryCount(workBidProject);
 		page.setCount(count);
 		page.setCountFlag(false);
@@ -215,7 +217,9 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 		if(workBidProjectList.getEndContractDate()==null){
 			workBidProjectList.setEndContractDate(new Date());
 		}
-		workBidProjectList.getSqlMap().put("dsf", dataScopeFilter(workBidProjectList.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_BID_PROJECT.getValue()));
+		String companyId = UserUtils.getUser().getComId();
+		workBidProjectList.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
+//		workBidProjectList.getSqlMap().put("dsf", dataScopeFilter(workBidProjectList.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_BID_PROJECT.getValue()));
 		workBidProjectList.setPage(page);
 		page.setList(findLists(workBidProjectList));
 		return page;

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

@@ -172,7 +172,7 @@
 						<label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
 						<div class="layui-input-block with-icon">
 							<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}"
-											title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="true"/>
+											title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
 						</div>
 					</div>
 				</div>