修改企业账户时不允许修改企业名称。文章和资源显示为发布时间，创建企业时isjoin设置为1

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

@@ -30,12 +30,12 @@ public interface ArticleDao {
    String queryById(Connection con, String articleId) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    @OrderBy(" ORDER BY publish_time DESC NULLS LAST")
    @Where("status='1'")
    PageQueryResult<ArticleInfo> queryByTime(Connection con, @Nullable @Like String articleTitle, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<ArticleInfo> queryByTime(Connection con, @Nullable @Like String articleTitle, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("publishTime") String bt, @Nullable @Alias("publishTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    @Where("status='1'")
    PageQueryResult<ArticleInfo> queryByPV(Connection con, @Nullable @Like String articleTitle, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<ArticleInfo> queryByPV(Connection con, @Nullable @Like String articleTitle, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("publishTime") String bt, @Nullable @Alias("publishTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

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

@@ -45,13 +45,17 @@ public interface OrgDao {
	@From(Organization.class)
	int updateAuthStatus(Connection con,String id,@Set String authStatus)throws SQLException;
	@UpdateWith
	@From(Organization.class)
	int updateIsJoin(Connection con,String id,@Set String isJoin)throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY create_time DESC NULLS LAST")
	PageQueryResult<OrganizationInfo> queryTime(Connection con, @Nullable @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like String city, @Nullable String authStatus, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
	@OrderBy(" ORDER BY ou.create_time DESC NULLS LAST")
	PageQueryResult<OrganizationInfo> queryTime(Connection con, @Nullable @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like String city, @Nullable String authStatus, @Nullable @GtEq @Alias("accountTime") String bt, @Nullable @Alias("accountTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY page_views DESC NULLS LAST")
	PageQueryResult<OrganizationInfo> queryViews(Connection con, @Nullable @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like String city, @Nullable String authStatus, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
	PageQueryResult<OrganizationInfo> queryViews(Connection con, @Nullable @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like String city, @Nullable String authStatus, @Nullable @GtEq @Alias("accountTime") String bt, @Nullable @Alias("accountTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
	@Nullable
	@QueryVal

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

@@ -29,12 +29,12 @@ public interface ResourceDao {
    String queryById(Connection con, String resourceId) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    @OrderBy(" ORDER BY publish_time DESC NULLS LAST")
    @Where("status='1'")
    PageQueryResult<ResourceInfo> queryByTime(Connection con, @Nullable @Like String resourceName, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<ResourceInfo> queryByTime(Connection con, @Nullable @Like String resourceName, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("publishTime") String bt, @Nullable @Alias("publishTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    @Where("status='1'")
    PageQueryResult<ResourceInfo> queryByPV(Connection con, @Nullable @Like String resourceName,@SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<ResourceInfo> queryByPV(Connection con, @Nullable @Like String resourceName,@SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("publishTime") String bt, @Nullable @Alias("publishTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

src/main/java/com/ekexiu/console/system/pojo/OrganizationInfo.java

@@ -9,10 +9,11 @@ import org.jfw.apt.orm.core.defaultImpl.StringHandler;
/**
 * Created by TT on 2017/5/18.
 */
@ExtendView(fromSentence = "organization o RIGHT JOIN org_user ou on ou.id = o.id LEFT JOIN (select watch_object id,count(1) num from watch WHERE watch_type = 6 group by id)as fans  on fans.id = o.id", tableAlias = "o")
@ExtendView(fromSentence = "organization o RIGHT JOIN org_user ou on ou.id = o.id LEFT JOIN (   select watch_object id,count(1) num from watch WHERE watch_type = 6 group by id)as fans  on fans.id = o.id", tableAlias = "o")
public class OrganizationInfo extends Organization {
    private String inviterId;
    private String registerEmail;
    private String accountTime;
    private boolean hasOrgLogo;
    private int fans;
@@ -51,4 +52,12 @@ public class OrganizationInfo extends Organization {
        this.inviterId = inviterId;
    }
    @CalcColumn(handlerClass = StringHandler.class, column = "ou.create_time")
    public String getAccountTime() {
        return accountTime;
    }
    public void setAccountTime(String accountTime) {
        this.accountTime = accountTime;
    }
}

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

@@ -331,6 +331,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
            throw new JfwBaseException(3003, "该邮箱已被注册");
        }
        if ((orgId !=null)&&(this.orgUserDao.query(con,orgId)==null)){
            this.orgDao.updateIsJoin(con, orgId, "1");
            OrgUser orgUser = new OrgUser();
            orgUser.setId(orgId);
            orgUser.setEmail(email);
@@ -347,6 +348,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        }
        if ((orgId == null)&&(this.orgUserDao.queryByEmail(con,email)==null)) {
            String id = this.createOrganization(con, name);
            this.orgDao.updateIsJoin(con, orgId, "1");
            OrgUser orgUser = new OrgUser();
            orgUser.setId(id);
            orgUser.setEmail(email);