用户管理列表-负责区域显示 最后修改时间显示

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -43,6 +43,7 @@ import org.springframework.util.CollectionUtils;
import javax.swing.text.html.parser.Entity;
import java.io.IOException;
import java.sql.PreparedStatement;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.logging.Logger;
@@ -935,6 +936,11 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                "\t\t\tusr . ID AS \"id\",\n" +
                "\t\t\tusr . NAME AS \"realName\",\n" +
                "\t\t\tusr .username AS \"username\",\n" +
                "\t\t\tusr .update_time AS \"updateTime\",\n" +
                "\t\t\tusr .create_time AS \"createTime\",\n" +
                "\t\t\tarea .city_name AS \"cityName\",\n" +
                "\t\t\tarea .town_name AS \"townName\",\n" +
                "\t\t\tarea .hospital_name AS \"hospitalName\",\n" +
                "\t\t\tCASE \n" +
                "\t\tWHEN usr .enabled=0 THEN\n" +
                "\t\t\t'已失效'\n" +
@@ -946,10 +952,12 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                "\t\tROLE . NAME AS \"roleName\"\n" +
                "\tFROM\n" +
                "\t\tbase_user usr,\n" +
                "\t\twlyy_user_area area,\n" +
                "\t\tbase_saas saas,\n" +
                "\t\tbase_role ROLE\n" +
                "\tWHERE\n" +
                "\t\tusr .saas_id = saas. ID\n" +
                "\t\tAnd usr .id = area.user_id\n" +
                "\tAND usr .role_id = ROLE . ID\n" ;
                if(!realName.equals(null) && !realName.equals("")){
                    finalSql = finalSql + " and usr . NAME LIKE '%"+realName+"%'";
@@ -974,6 +982,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                sql+=" LIMIT  " + (page - 1) * size + "," + size + "";
                Logger.getAnonymousLogger().info("sql="+sql);
                list = jdbcTemplate.queryForList(sql);
                //时间格式转换
            }else {
                String oracleSql="SELECT\n" +
                        "\t*\n" +
@@ -1007,6 +1016,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                "  COUNT(usr.id) " +
                "FROM " +
                "  base_user usr, " +
                "  wlyy_user_area area, " +
                "  base_saas saas, " +
                "  base_role role " +
                "WHERE " +