Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

src/main/java/com/nis/web/controller/sys/UserController.java

@@ -179,6 +179,9 @@ public class UserController extends BaseController{
 	@RequiresPermissions("sys:user:view")
 	@RequestMapping(value = {"list"})
 	public String list(SysUser user, HttpServletRequest request, HttpServletResponse response, Model model) {
+		if(UserUtils.getUser().getIdentity().equals(0)){
+			user.setIdentity(0);
+		}
 		Page<SysUser> page = userService.findUser(new Page<SysUser>(request, response), user);
         model.addAttribute("page", page);
 		return "/sys/userList";

src/main/java/com/nis/web/dao/UserDao.xml

@@ -292,7 +292,9 @@
 		<if test="loginId != null and loginId !=''">
 			AND u.login_id=#{loginId} 
 		</if>
-			
+		<if test="identity != null and identity!=1">
+			AND u.identity=#{identity} 
+		</if>	
 			
 		<if test="name != null and name != ''">
 			AND u.name like