Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sys/dao/UserDao.java

@@ -28,6 +28,7 @@ public interface UserDao extends CrudDao<User> {
 	 * @return
 	 */
 	public User getByLoginName(User user);
+	public List<User> getByName(User user);
 
 	public User getByUserId(String id);
 	public User findUserByNo(@Param("no")String no,@Param("companyId")String companyId);

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

@@ -36,6 +36,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * 用户工具类
@@ -143,7 +144,18 @@ public class UserUtils {
 		//UserUtils.clearCache();
 		User user = (User)CacheUtils.get(USER_CACHE, USER_CACHE_LOGIN_NAME_ + loginName);
 		if (user == null){
-			user = userDao.getByLoginName(new User(null, loginName));
+			User user1 = new User();
+			Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+			if(pattern.matcher(loginName).matches() || loginName.equals("admin")){
+				user1.setLoginName(loginName);
+				user = userDao.getByLoginName(user1);
+			}else {
+				user1.setName(loginName);
+				List<User> list = userDao.getByName(user1);
+				if(list != null && list.size()>0){
+				   user = list.get(0);
+				}
+			}
 			if (user == null){
 				return null;
 			}
@@ -162,7 +174,23 @@ public class UserUtils {
 	 * @return 取不到返回null
 	 */
 	public static User getByLoginNameNoSesion(String loginName){
-		User user = userDao.getByLoginName(new User(null, loginName));
+//		User user = userDao.getByLoginName(new User(null, loginName));
+////		if (user == null){
+////			return null;
+////		}
+		User user = new User();
+		User user1 = new User();
+		Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+		if(pattern.matcher(loginName).matches() || loginName.equals("admin")){
+			user1.setLoginName(loginName);
+			user = userDao.getByLoginName(user1);
+		}else {
+			user1.setName(loginName);
+			List<User> list = userDao.getByName(user1);
+			if(list != null && list.size()>0){
+				user = list.get(0);
+			}
+		}
 		if (user == null){
 			return null;
 		}

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -212,6 +212,20 @@
 		WHERE a.login_name = #{loginName} AND a.del_flag = #{DEL_FLAG_NORMAL}
 	</select>
 
+	<!-- 根据登录名查询用户 -->
+	<select id="getByName" resultType="User" parameterType="User">
+		SELECT
+		<include refid="userColumns"/><!-- ,
+			ro.office_id AS "roleList.officeList.id" -->
+		FROM sys_user a
+		LEFT JOIN sys_office s ON s.id = a.company_id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		LEFT JOIN sys_office bo ON bo.id = o.branch_office
+		<!--
+		LEFT JOIN sys_role_office ro ON ro.role_id = r.id -->
+		WHERE a.name = #{name} AND a.del_flag = #{DEL_FLAG_NORMAL}
+	</select>
+
 	<!-- 分页查询用户信息 -->
 	<select id="findList" resultType="User">
 		SELECT

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -373,13 +373,13 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>职    级：</label>
-                    <div class="layui-input-block with-icon">
-                        <sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"
-                                                title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
-                    </div>
-                </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label"><span class="require-item">*</span>职    级：</label>--%>
+                    <%--<div class="layui-input-block with-icon">--%>
+                        <%--<sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"--%>
+                                                <%--title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>基本工资：</label>
                     <div class="layui-input-block with-icon">