Browse Source

权限:修复模糊查询问题

wangdy 8 years ago
parent
commit
8fec26401e

+ 4 - 4
src/main/java/com/uas/platform/b2c/common/account/dao/UserDao.java

@@ -75,7 +75,7 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
 	 * @return
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query("select u.userUU from User u inner join u.enterprises as e where e.uu = :enUU and u.userName = :userName")
+	@Query("select u.userUU from User u inner join u.enterprises as e where e.uu = :enUU and u.userName like %:userName%")
 	public List<Long> findUserByUserNameAndEnUU(@Param("userName") String userName, @Param("enUU") Long enUU);
 
 	/**
@@ -86,7 +86,7 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
 	 * @return
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query("select u.userUU from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail = :userEmail")
+	@Query("select u.userUU from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail like %:userEmail%")
 	public List<Long> findUserByUserEmailAndEnUU(@Param("userEmail") String userEmail, @Param("enUU") Long enUU);
 
 	/**
@@ -97,7 +97,7 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
 	 * @return
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query("select u.userUU from User u inner join u.enterprises as e where e.uu = :enUU and u.userTel = :userTel")
+	@Query("select u.userUU from User u inner join u.enterprises as e where e.uu = :enUU and u.userTel like %:userTel%")
 	public List<Long> findUserByUserTelAndEnUU(@Param("userTel") String userTel, @Param("enUU") Long enUU);
 
 	/**
@@ -108,7 +108,7 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
 	 * @return
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query("select u.userUU from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU = :userUU")
+	@Query("select u.userUU from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU like %:userUU%")
 	public List<Long> findUserByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU);
 
 	/**

+ 1 - 1
src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -207,7 +207,7 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public Page<User> findUsersPageByEnUUAndKeyword(final PageInfo pageInfo , Long enUU , String keyword, Long roleId) {
 		List<Long> usersId = new ArrayList<>();
-		if(keyword == null){
+		if(keyword == null || "".equals(keyword)){
 			usersId = userDao.findIdByEnUU(enUU);
 		}else {
 			if (keyword.contains("@")) { // 按邮箱查找

+ 5 - 5
src/main/webapp/resources/view/vendor/modal/edit_user_role.html

@@ -97,7 +97,7 @@
         font-size: 12px;
         cursor: pointer;
     }
-    .pagination li:first-child a, .pagination li:last-child a{
+    .user-role-manage .pagination li:first-child a, .user-role-manage .pagination li:last-child a{
         font-size: 20px;
     }
     .user-role-manage ul.pagination.ng-table-pagination > li > a > span {
@@ -156,16 +156,16 @@
         height: 29px;
         line-height: 13px;
     }
-    .pagination li.active a span{
+    .user-role-manage .pagination li.active a span{
         color: white !important;
     }
-    .ng-table-pager .ng-table-pagination li.active a {
+    .user-role-manage .ng-table-pager .ng-table-pagination li.active a {
         background: none!important;
     }
-    .ng-table-pager .ng-table-pagination li a {
+    .user-role-manage .ng-table-pager .ng-table-pagination li a {
         background: none!important;
     }
-    .ng-table-pager .ng-table-pagination li.active a span {
+    .user-role-manage .ng-table-pager .ng-table-pagination li.active a span {
         color: #5078cb!important;
     }
 </style>