`转码修改`

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1168,10 +1168,8 @@ public class ActTaskService extends BaseService {
 			vars.put("manager", false);
 			vars.put("company", true);
 			vars.put("reject", false);
-            if (tuser !=null || tuser !="") {
-                String loginName = UserUtils.getByLoginName(tuser).getLoginName();
-                vars.put("processer", loginName);
-            }
+			String loginName = UserUtils.getUser().getLoginName();
+			vars.put("processer", loginName);
 		} else {
 			vars.put("manager", false);
 			vars.put("company", false);

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/UploadController.java

@@ -105,7 +105,7 @@ public class UploadController extends BaseController {
 			List<UploadImages> list = page.getList();
 			for (UploadImages upload:
 				 list) {
-				upload.setPath("http://" + request.getServerName() + "/data/nginx/file" +upload.getPath());
+				upload.setPath("http://" + request.getServerName()  +upload.getPath());
 			}
 		}
 		return getBootstrapData(page);

src/main/java/com/jeeplus/modules/sys/entity/User.java

@@ -47,7 +47,7 @@ public class User extends DataEntity<User> {
 	private String oldLoginName;// 原登录名
 	private String newPassword;	// 新密码
 	private String sign;//签名
-	
+
 	private String oldLoginIp;	// 上次登陆IP
 	private Date oldLoginDate;	// 上次登陆日期
 	

src/main/java/com/jeeplus/modules/sys/mapper/xml/UserMapper.xml

@@ -144,6 +144,12 @@
 					<if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if>
 					<if test="dbName == 'mssql'">'%'+#{office.id}+'%')</if>
 		</if>
+		<if  test="roleList !=null and roleList!= ''">
+			and a.id in
+			<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+				#{item.name}
+			</foreach>
+		</if>
 		<!-- 如果不是超级管理员，则不显示超级管理员用户 -->
 		<if test="!currentUser.admin">
 			AND a.id != '1'

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -7,6 +7,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -100,7 +102,16 @@ public class UserController extends BaseController {
 	@RequiresPermissions("sys:user:index")
 	@ResponseBody
 	@RequestMapping(value = {"list", ""})
-	public Map<String, Object> list(User user, HttpServletRequest request, HttpServletResponse response, Model model) {
+	public Map<String, Object> list(User user, HttpServletRequest request, HttpServletResponse response, Model model,String roleNeedName) {
+		String[] split = roleNeedName.split(";");
+		Role role = null;
+		List<Role> roles = new ArrayList<>();
+		for (int i = 0; i < split.length; i++) {
+			role = new Role();
+			role.setName(split[i]);
+			roles.add(role);
+		}
+		user.setRoleList(roles);
 		Page<User> page = systemService.findUser(new Page<User>(request, response), user);
 		return getBootstrapData(page);
 	}

src/main/webapp/webpage/modules/common/userSelect.jsp

@@ -187,7 +187,7 @@
 					<form id="searchForm" class="form form-horizontal well clearfix" >
 					    <input type="hidden" id="companyId" name="company.id"/>
 					     <input type="hidden" id="officeId" name="office.id"/>
-						<input type="hidden" id="roleName" name="roleName" value="${roleName}">
+						<input type="hidden" id="roleNeedName" name="roleNeedName" value="${roleName}">
 					    <div class="col-sm-4">
 					    	<label class="label-item single-overflow pull-left" title="登录名：">登录名：</label>
 					   		<input type="text" name="loginName" maxlength="100"  class=" form-control"/>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionForm.jsp

@@ -129,7 +129,7 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>归属用户：</label></td>
 								<td class="width-35">
-									<sys:userselect roleName="项目经理" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
 								</td>
 							</tr>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideAudit.jsp

@@ -110,7 +110,7 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审核人：</label></td>
 								<td class="width-35">
-									<sys:userselect id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
 								</td>
 							</tr>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideForm.jsp

@@ -184,7 +184,7 @@
 					</div>
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 					<form:hidden path="id"/>
-						${fns:unescapeHtml(construction.id)}
+						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
 
 						<table class="table table-bordered">
 							<tbody>
@@ -195,7 +195,7 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审核人：</label></td>
 								<td class="width-35">
-									<sys:userselect id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
 								</td>
 							</tr>