优化

tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.tamguo.modules.sys.model.enums.SysUserStatusEnum;
 
@@ -39,10 +40,14 @@ public class SysUserEntity implements Serializable {
 	private String phone;
 	private Date pwdQuestUpdateDate;
 	private String pwdQuestion;
+	@TableField(value="pwd_question_2")
 	private String pwdQuestion2;
+	@TableField(value="pwd_question_3")
 	private String pwdQuestion3;
 	private String pwdQuestionAnswer;
+	@TableField(value="pwd_question_answer_2")
 	private String pwdQuestionAnswer2;
+	@TableField(value="pwd_question_answer_3")
 	private String pwdQuestionAnswer3;
 	private BigDecimal pwdSecurityLevel;
 	private Date pwdUpdateDate;

tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java

@@ -17,6 +17,7 @@ public class SysUserCondition {
 	private String companyName;
 	private String postCode;
 	private String status;
+	private String userType;
 	
 	public Integer getPageNo() {
 		return pageNo;
@@ -102,5 +103,11 @@ public class SysUserCondition {
 	public void setStatus(String status) {
 		this.status = status;
 	}
+	public String getUserType() {
+		return userType;
+	}
+	public void setUserType(String userType) {
+		this.userType = userType;
+	}
 	
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java

@@ -0,0 +1,8 @@
+package com.tamguo.modules.sys.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.tamguo.modules.sys.model.SysPostEntity;
+
+public interface ISysPostService extends IService<SysPostEntity>{
+
+}

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java

@@ -0,0 +1,13 @@
+package com.tamguo.modules.sys.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.tamguo.modules.sys.dao.SysPostMapper;
+import com.tamguo.modules.sys.model.SysPostEntity;
+import com.tamguo.modules.sys.service.ISysPostService;
+
+@Service
+public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPostEntity> implements ISysPostService{
+
+}

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java

@@ -22,7 +22,6 @@ public class SysUserServiceImpl implements ISysUserService{
 		return sysUserMapper.queryByLoginCode(loginCode);
 	}
 
-
 	@Transactional(readOnly=false)
 	@Override
 	public Page<SysUserEntity> listData(SysUserCondition condition) {

tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysPostController.java

@@ -18,7 +18,7 @@ import com.tamguo.modules.sys.utils.Result;
 
 @Controller
 @RequestMapping(path="sys/post")
-public class PostController {
+public class SysPostController {
 
 	private final String POST_INDEX_PAGE = "modules/sys/post/index";
 	private final String POST_UPDATE_PAGE = "modules/sys/post/update";

tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java

@@ -6,10 +6,13 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
 
+import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.tamguo.modules.sys.model.SysUserEntity;
 import com.tamguo.modules.sys.model.condition.SysUserCondition;
+import com.tamguo.modules.sys.service.IPostService;
 import com.tamguo.modules.sys.service.ISysUserService;
 import com.tamguo.modules.sys.utils.Result;
 
@@ -17,8 +20,20 @@ import com.tamguo.modules.sys.utils.Result;
 @RequestMapping(path="sys/user")
 public class SysUserController {
 	
+	private final String USER_LIST_PAGE = "modules/sys/user/list";
+	
 	@Autowired
 	private ISysUserService iSysUserService;
+	@Autowired
+	private IPostService iPostService;
+	
+	@SuppressWarnings("unchecked")
+	@RequestMapping(path="list")
+	public ModelAndView list(ModelAndView model) {
+		model.setViewName(USER_LIST_PAGE);
+		model.addObject("postList", iPostService.selectList(Condition.create().eq("status", "0")));
+		return model;
+	}
 
 	@RequestMapping(path="listData",method=RequestMethod.POST)
 	@ResponseBody

tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml

@@ -28,6 +28,7 @@
 			u.`status`
 		FROM
 			sys_user u
+		LEFT JOIN sys_user_post up ON u.user_code = up.user_code
 		WHERE
 			1 = 1
 		<if test="loginCode != null and loginCode != ''">
@@ -61,11 +62,14 @@
 			and u.company_name = #{companyName}
 		</if>
 		<if test="postCode != null and postCode != ''">
-			and u.post_code = #{postCode}
+			and up.post_code = #{postCode}
 		</if>
 		<if test="status != null and status != ''">
 			and u.status = #{status}
 		</if>
+		<if test="userType != null and userType != ''">
+			and u.user_type = #{userType}
+		</if>
   	</select>
 
 </mapper>

tamguo-oms/src/main/resources/templates/modules/sys/user/list.html

@@ -42,6 +42,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 				<div class="form-group">
 					<label class="control-label">账号：</label>
 					<div class="control-inline">
+						<input id="userType" type="hidden" name="userType" value="employee" class="isReset"/>
 						<input type="text" id="loginCode" name="loginCode" value="" maxlength="100" class="form-control width-90"/>
 					</div>
 				</div>
@@ -253,10 +254,7 @@ $("#companyButton,#companyName").click(function(){
 					<div class="control-inline width-90">
 						<select id="employee_postCode" name="postCode" class="form-control">
 							<option value="">&nbsp;</option>
-							<option value="cfo">财务经理</option>
-							<option value="hrm">人力经理</option>
-							<option value="dept">部门经理</option>
-							<option value="user">普通员工</option>
+							<option th:value="${post.postCode}" th:each="post,postStatus:${postList}" th:text="${post.postName}">财务经理</option>
 						</select>					
 					</div>
 				</div>