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

src/dsb/com/cnd3b/common/Controller.java

@@ -532,12 +532,18 @@ public class Controller extends BaseClass {
      * @return
      */
     public String getHeadPic(long userid) {
-        if (!headPicMap.containsKey(userid)) {
+//        if (!headPicMap.containsKey(userid)) {
             Rows rows = getAttachmentUrl("tenterprise_users", String.valueOf(userid), "headportrait");
             if (!rows.isEmpty()) {
-                headPicMap.put(userid, rows.get(0).getString("fobsurl_thumbnail"));
+                System.err.println(rows.get(0).getString("fobsurl_thumbnail"));
+                if(rows.get(0).getString("fobsurl_thumbnail").equals("")){
+                    headPicMap.put(userid, rows.get(0).getString("fobsurl"));
+                }else{
+                    headPicMap.put(userid, rows.get(0).getString("fobsurl_thumbnail"));
+                }
+
             }
-        }
+//        }
         return headPicMap.getOrDefault(userid, "");
     }
 

src/dsb/com/cnd3b/restcontroller/customer/supplyanddemand/supplyanddemand.java

@@ -162,6 +162,9 @@ public class supplyanddemand extends Controller {
         } else {
             Rows rows = dbConnect.runSqlQuery("select ftitle,tenterprise_userid from tsupplyanddemand where siteid='" + siteid + "' and tsupplyanddemandid='" + tsupplyanddemandid + "'");
             if (!rows.isEmpty()) {
+                if(rows.get(0).getString("fstatus").equals("对接中")){
+                    return getErrReturnObject().setErrMsg("正在对接中").toString();
+                }
                 //聊天对话框不存在时，自动生成一个聊天对话框
                 PaoSetRemote timdialogSet = getP2ServerSystemPaoSet("timdialog");
                 PaoRemote timdialog = timdialogSet.addAtEnd();