栏目模版修改，可修改已激活用户信息

src/main/java/com/ekexiu/console/system/dao/AuthApplyDao.java

@@ -71,7 +71,7 @@ public abstract class AuthApplyDao {
    }
    @QueryList
    @OrderBy("ORDER BY CREATE_TIME")
    @OrderBy("ORDER BY CREATE_TIME DESC")
    public abstract List<AuthApplyInfo> queryInfo(Connection con, Integer applyType) throws SQLException;
    @QueryOne
@@ -79,7 +79,7 @@ public abstract class AuthApplyDao {
    public abstract AuthApplyInfo queryInfo(Connection con, String authApplyId) throws SQLException;
    @QueryList
    @OrderBy("ORDER BY CREATE_TIME")
    @OrderBy("ORDER BY CREATE_TIME DESC")
    public abstract List<OrgApplyInfo> queryOrgInfo(Connection con, Integer applyType)throws SQLException;
    @QueryOne

src/main/java/com/ekexiu/console/system/service/DiscoverBannerService.java

@@ -41,27 +41,27 @@ public class DiscoverBannerService {
    //private Configuration cfg = new Configuration(Configuration.VERSION_2_3_26);
    private String templatePc = "<ul id=\"slide-list\" class=\"slide-list floatL\">\n" +
            "    <li class=\"slide-item slide-item-active\" data-col=\"${banner[0].bannerId}\">\n" +
            "    <li class=\"slide-item slide-item-active\" data-id=\"${banner[0].articleId}\" data-col=\"${banner[0].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[0].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[0].image}');\">\n" +
            "            <p class=\"title\">${banner[0].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "    <li class=\"slide-item\" data-col=\"${banner[1].bannerId}\">\n" +
            "    <li class=\"slide-item\" data-id=\"${banner[1].articleId}\" data-col=\"${banner[1].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[1].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[1].image}');\">\n" +
            "            <p class=\"title\">${banner[1].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "    <li class=\"slide-item\" data-col=\"${banner[2].bannerId}\">\n" +
            "    <li class=\"slide-item\" data-id=\"${banner[2].articleId}\" data-col=\"${banner[2].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[2].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[2].image}');\">\n" +
            "            <p class=\"title\">${banner[2].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "    <li class=\"slide-item\" data-col=\"${banner[3].bannerId}\">\n" +
            "    <li class=\"slide-item\" data-id=\"${banner[3].articleId}\" data-col=\"${banner[3].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[3].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[3].image}');\">\n" +
            "            <p class=\"title\">${banner[3].title}</p>\n" +
            "        </a>\n" +
            "    </li>\n" +
            "    <li class=\"slide-item\" data-col=\"${banner[4].bannerId}\">\n" +
            "    <li class=\"slide-item\" data-id=\"${banner[4].articleId}\" data-col=\"${banner[4].bannerId}\">\n" +
            "        <a href=\"articalShow.html?articleId=${banner[4].articleId}\" target=\"_blank\" style=\"background-image:url('/data/article/${banner[4].image}');\">\n" +
            "            <p class=\"title\">${banner[4].title}</p>\n" +
            "        </a>\n" +
@@ -86,28 +86,28 @@ public class DiscoverBannerService {
            "</ul>";
    private String templateApp = "<div class=\"mui-slider-group mui-slider-loop\">\n" +
            "\n" +
            "    <div class=\"mui-slider-item mui-slider-item-duplicate\" style=\"height:210px;\" data-id=\"${banner[4].articleId}\" col-id=\"${banner[4].bannerId}\">\n" +
            "        <a href=\"#\" class=\"bgImg photoTop\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner[4].image}');top:105px;height:210px;\">\n" +
            "            <p class=\"mui-slider-title sizefont elipse he\">${banner[4].title}</p>\n" +
            "    <div class=\"mui-slider-item mui-slider-item-duplicate\" data-id=\"${banner[4].articleId}\" col-id=\"${banner[4].bannerId}\">\n" +
            "        <a href=\"#\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner[4].image}');\">\n" +
            "            <p class=\"mui-slider-title\">${banner[4].title}</p>\n" +
            "        </a>\n" +
            "    </div>\n" +
            "\n" +
            "    <#list banner as banner>\n" +
            "    <div class=\"mui-slider-item\" style=\"height:210px;\" data-id=\"${banner.articleId}\" col-id=\"${banner.bannerId}\">\n" +
            "        <a href=\"#\" class=\"bgImg photoTop\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner.image}');top:105px;height:210px;\">\n" +
            "            <p class=\"mui-slider-title sizefont elipse he\">${banner.title}</p>\n" +
            "        </a>\n" +
            "    </div>\n" +
            "        <div class=\"mui-slider-item\" data-id=\"${banner.articleId}\" col-id=\"${banner.bannerId}\">\n" +
            "            <a href=\"#\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner.image}');\">\n" +
            "                <p class=\"mui-slider-title\">${banner.title}</p>\n" +
            "            </a>\n" +
            "        </div>\n" +
            "    </#list>\n" +
            "\n" +
            "    <div class=\"mui-slider-item mui-slider-item-duplicate\" style=\"height:210px;\" data-id=\"${banner[0].articleId}\" col-id=\"${banner[0].bannerId}\">\n" +
            "        <a href=\"#\" class=\"bgImg photoTop\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner[0].image}');top:105px;height:210px;\">\n" +
            "            <p class=\"mui-slider-title sizefont elipse he\">${banner[0].title}</p>\n" +
            "    <div class=\"mui-slider-item mui-slider-item-duplicate\" data-id=\"${banner[0].articleId}\" col-id=\"${banner[0].bannerId}\">\n" +
            "        <a href=\"#\" style=\"background-image:url('http://www.ekexiu.com/data/article/${banner[0].image}');\">\n" +
            "            <p class=\"mui-slider-title \">${banner[0].title}</p>\n" +
            "        </a>\n" +
            "    </div>\n" +
            "\n" +
            "</div>\n" +
            "<div class=\"mui-slider-indicator mui-text-right\" style=\"bottom:30px;\">\n" +
            "<div class=\"mui-slider-indicator\">\n" +
            "    <div class=\"mui-indicator mui-active\"></div>\n" +
            "    <div class=\"mui-indicator\"></div>\n" +
            "    <div class=\"mui-indicator\"></div>\n" +

src/main/java/com/ekexiu/console/system/service/ProfessorService.java

@@ -135,32 +135,32 @@ public class ProfessorService {
    @Path
    public void update(@JdbcConn(true) Connection con, @RequestBody ProfessorInfo professor) throws SQLException, JfwBaseException, IOException {
        UserDetail userDetail = this.professorDao.queryDetail(con, professor.getId());
        if (!Objects.equals(userDetail.getActiveStatus(), "1")) {
            if (professor.getOrgName() != null) {
                if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
                    professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
                } else {
                    professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
                }
            }
            this.professorDao.update(con, professor);
            if (professor.getResearchAreas() != null && !professor.getResearchAreas().isEmpty()) {
                this.researchAreaService.saveResearchArea(con, professor.getResearchAreas());
        //if (!Objects.equals(userDetail.getActiveStatus(), "1")) {
        if (professor.getOrgName() != null) {
            if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
                professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
            } else {
                this.researchAreaService.delete(con, professor.getId());
            }
            Professor p = this.professorDao.query(con, professor.getId());
            String subject = p.getSubject();
            if (subject == null) {
                subject = "";
                professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
            }
            String industry = p.getIndustry();
            if (industry == null)
                industry = "";
            this.keyWordService.refreshProfessor(con, professor.getId(), subject + "," + industry);
        }
        this.professorDao.update(con, professor);
        if (professor.getResearchAreas() != null && !professor.getResearchAreas().isEmpty()) {
            this.researchAreaService.saveResearchArea(con, professor.getResearchAreas());
        } else {
            throw new JfwBaseException(50000, "只能修改未激活用户信息");
            this.researchAreaService.delete(con, professor.getId());
        }
        Professor p = this.professorDao.query(con, professor.getId());
        String subject = p.getSubject();
        if (subject == null) {
            subject = "";
        }
        String industry = p.getIndustry();
        if (industry == null)
            industry = "";
        this.keyWordService.refreshProfessor(con, professor.getId(), subject + "," + industry);
        //} else {
        //    throw new JfwBaseException(50000, "只能修改未激活用户信息");
        //}
    }
    @Get