Przeglądaj źródła

更新商家和人员休息

Bitliker 8 lat temu
rodzic
commit
41c3aa8f1d

+ 0 - 2
app_core/common/src/main/java/com/core/model/User.java

@@ -9,8 +9,6 @@ import java.io.Serializable;
 
 
 /**
 /**
  * 用户表
  * 用户表
- * 
- * 
  */
  */
 @DatabaseTable(tableName = "user")
 @DatabaseTable(tableName = "user")
 public class User implements Serializable, Cloneable {
 public class User implements Serializable, Cloneable {

+ 1 - 0
app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -88,6 +88,7 @@ public class HttpClient {
 
 
     public static HttpClient newInstance(Builder builder) {
     public static HttpClient newInstance(Builder builder) {
         instance = new HttpClient(builder);
         instance = new HttpClient(builder);
+
         return instance;
         return instance;
     }
     }
 
 

+ 2 - 8
app_modular/appme/src/main/java/com/uas/appme/settings/activity/BRestActivity.java

@@ -113,7 +113,6 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 						if (mAdapter != null) {
 						if (mAdapter != null) {
 							mAdapter.updateData(position, model);
 							mAdapter.updateData(position, model);
 						}
 						}
-
 					}
 					}
 				}
 				}
 			}
 			}
@@ -261,7 +260,6 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 		} else {
 		} else {
 			sc_companyname = model.getCompanyname();
 			sc_companyname = model.getCompanyname();
 			sc_companyid = model.getCompanyid();
 			sc_companyid = model.getCompanyid();
-
 		}
 		}
 		if (type == 1) {
 		if (type == 1) {
 			map.put("sf_companyname", sc_companyname);
 			map.put("sf_companyname", sc_companyname);
@@ -274,16 +272,12 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 				map.put("sf_username", model.getUsername());
 				map.put("sf_username", model.getUsername());
 				map.put("sf_userid", model.getUserId());
 				map.put("sf_userid", model.getUserId());
 			}
 			}
-			if (!StringUtil.isEmpty(model.get_id())) {
-				map.put("sf_id", model.get_id());
-			}
+			map.put("sf_id", StringUtil.isEmpty(model.get_id()) ? "0" : model.get_id());
 		} else {
 		} else {
 			map.put("sc_companyname", sc_companyname);
 			map.put("sc_companyname", sc_companyname);
 			map.put("sc_companyid", sc_companyid);
 			map.put("sc_companyid", sc_companyid);
 			map.put("sc_date", date);
 			map.put("sc_date", date);
-			if (!StringUtil.isEmpty(model.get_id())) {
-				map.put("sc_id", model.get_id());
-			}
+			map.put("sc_id", StringUtil.isEmpty(model.get_id()) ? "0":model.get_id());
 		}
 		}
 		return map;
 		return map;
 	}
 	}