修改参数

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -667,9 +667,9 @@ public class UserService {
         entityManager.clear();
         entityManager.clear();
         PageResult<UserInfoSearch> pageResult = new PageResult<>();
         PageResult<UserInfoSearch> pageResult = new PageResult<>();
         String count = "select count(*) ";
         String count = "select count(*) ";
-        String select = "SELECT UserInfoSearch ";
-        String limit = " ORDER BY su.createdTime  DESC  limit " + (search.getPage() - 1) * search.getSize() + "," + search.getSize();
-        StringBuffer querySql = new StringBuffer("from UserEntity su left join UserRoleEntity sur on su.id =sur.userId left JOIN RoleEntity sr on sr.id =sur.roleId where 1=1 ");
+        String select = "SELECT su.*,sr.name roleName ";
+        String limit = " ORDER BY su.CREATED_TIME  DESC   limit " + (search.getPage() - 1) * search.getSize() + "," + search.getSize();
+        StringBuffer querySql = new StringBuffer("from sys_user su left join sys_user_role sur on su.id =sur.user_id left JOIN sys_role sr on sr.id =sur.role_id where 1=1 ");
         if (StringUtils.isNotBlank(search.getRoleId())) {
         if (StringUtils.isNotBlank(search.getRoleId())) {
             querySql.append("sr.id ='" + search.getRoleId() + "'");
             querySql.append("sr.id ='" + search.getRoleId() + "'");
         }
         }
@@ -677,9 +677,9 @@ public class UserService {
             querySql.append("su.source ='" + search.getSource() + "'");
             querySql.append("su.source ='" + search.getSource() + "'");
         }
         }
         if (null != search.getSource()) {
         if (null != search.getSource()) {
-            querySql.append("(su.engineerCode LIKE '%" + search.getQueryString() + "%' or su.nickname like '%" + search.getQueryString() + "%' or su.phone like '%" + search.getQueryString() + "%' or su.email  like '%" + search.getQueryString() + "%' )");
+            querySql.append("(su.engineer_code LIKE '%" + search.getQueryString() + "%' or su.nickname like '%" + search.getQueryString() + "%' or su.phone like '%" + search.getQueryString() + "%' or su.email  like '%" + search.getQueryString() + "%' )");
         }
         }
-        Long countNum = (Long) entityManager.createQuery(count + querySql.toString()).getSingleResult();
+        Long countNum = (Long) entityManager.createNativeQuery(count + querySql.toString()).getSingleResult();
         if (countNum.intValue() == 0) {
         if (countNum.intValue() == 0) {
             return pageResult;
             return pageResult;
         }
         }