Merge remote-tracking branch 'origin/develop' into develop

src/dsb/com/cnd3b/restcontroller/customer/usercenter/teammsg/SQL/团队加入申请列表.sql

@@ -1,12 +1,12 @@
-SELECT tenterprise_userid,
-       fname,
-       tagentteamapplyid,
-       createdate,
-       tagentsid,
-       fuserid,
-       fstatus,
-       fphonenumber,
-       siteid
-FROM TAGENTTEAMAPPLY
-WHERE tagentsid = $tagentsid$
-  AND siteid = $siteid$ AND fstatus = 'н¨'
+SELECT t1.tenterprise_userid,
+       t1.fname,
+       t1.tagentteamapplyid,
+       t1.createdate,
+       t1.tagentsid,
+       t1.fuserid,
+       t1.fstatus,
+       t1.fphonenumber,
+       t1.siteid
+FROM TAGENTTEAMAPPLY t1
+WHERE t1.tagentsid = $tagentsid$
+  AND t1.siteid = $siteid$ AND t1.fstatus = 'ÉêÇë'

src/dsb/com/cnd3b/restcontroller/customer/usercenter/teammsg/teammsg.java

@@ -34,6 +34,8 @@ public class teammsg extends Controller {
         System.err.println(tagentsid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
 
+        System.err.println(sqlFactory.getSQL());
+
         SQLFactory subusersql = new SQLFactory(this, "下级账号查询");
         subusersql.addParameter("siteid", siteid);
         subusersql.addParameter_in("fparentid", rows.toArrayList("tenterprise_userid"));
@@ -195,6 +197,7 @@ public class teammsg extends Controller {
                 if (ftype.equals("个人")) {
                     paoRemote_tenterprise.getPaoSet("tagents", "tagents", "tagentsid=:tagentsid").getPao(0).delete();
                     paoRemote_tenterprise.setValue("tagentsid", tagentsid, 11L);
+                    paoRemote_tenterprise.setValue("fisadministrator", 0, 11L);
                 } else {
                     PaoRemote pao = paoSetRemote_tenterprise.addAtEnd();
                     pao.setValue("SITEID", paoRemote_tenterprise.getString("SITEID"), 11L);
@@ -227,11 +230,11 @@ public class teammsg extends Controller {
      */
     public String getEntryTeamApplyList() {
         SQLFactory sqlFactory = new SQLFactory(this, "团队加入申请列表", pageSize, pageNumber, "createdate");
-        sqlFactory.addParameter("tagentsid", "35208");
+        sqlFactory.addParameter("tagentsid", tagentsid);
         sqlFactory.addParameter("siteid", siteid);
+//        System.err.println(sqlFactory.getSQL());
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         for (Row row : rows) {
-            System.err.println(row.getString("tenterprise_userid"));
             row.put("attinfos", getAttachmentUrl("tenterprise_users", row.getString("tenterprise_userid")));
         }
 

src/dsb/com/cnd3b/restcontroller/publicmethod/homepage/SQL/供需列表查询.sql

@@ -11,7 +11,9 @@ t1.checkdate,
 t1.fenddate,
 t2.fagentname,
 t1.tagentsid,
-t1.tenterprise_userid
+t1.tenterprise_userid,
+t1.freadtimes,
+(select count(0) from timdialog where siteid=t1.siteid and ownertable='tsupplyanddemand' and ownerid=t1.tsupplyanddemandid) as fcommunicationtimes
 from tsupplyanddemand t1
 inner join tagents t2 on t1.siteid=t2.siteid and t1.tagentsid=t2.tagentsid
 where t1.siteid=$siteid$ and t1.fstatus not in ('н¨') and $where$

src/dsb/com/cnd3b/restcontroller/publicmethod/users/Users.java

@@ -165,7 +165,7 @@ public class Users extends Controller {
         if (!queryPaoSetRemote.isEmpty()) {
             PaoRemote remote = queryPaoSetRemote.getPao(0);
             String fstatus = remote.getString("fstatus");
-            if (fstatus.equals("新建")) {
+            if (fstatus.equals("申请")) {
                 return getErrReturnObject().setErrCode(2).setErrMsg("正在申请中").toString();
             } else if (fstatus.equals("审核")) {
                 return getErrReturnObject().setErrCode(3).setErrMsg("已通过申请").toString();
@@ -191,7 +191,7 @@ public class Users extends Controller {
         paoRemote.setValue("TENTERPRISE_USERID", userid, 11L);
         paoRemote.setValue("TAGENTSID", tagentsid, 11L);
         paoRemote.setValue("FNAME", fname, 11L);
-        paoRemote.setValue("FSTATUS", "新建", 11L);
+        paoRemote.setValue("FSTATUS", "申请", 11L);
         paoRemote.setValue("FUSERID", userid, 11L);
         queryPaoSetRemote.save();