Просмотр исходного кода

Merge branch 'test' of jishutao/aft into prod

liliang4869 лет назад: 7
Родитель
Сommit
0c97e10f4f

+ 1 - 1
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -111,7 +111,7 @@ public class AdminListBo {
 	}
 
 	public String getUserNo() {
-		return null;
+		return "";
 	}
 
 	public void setUserNo(String userNo) {

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -1063,7 +1063,7 @@
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department f on 
 			c.department_id = f.id
-		where a.order_type = 0 and a.delete_sign=0
+		where a.order_type = 0 and a.delete_sign != 1
 		<if test="orderNo != null">
 			and a.order_no= #{orderNo,jdbcType=VARCHAR}
 		</if>

+ 1 - 1
src/main/java/com/goafanti/common/model/Admin.java

@@ -158,7 +158,7 @@ public class Admin extends BaseModel implements AftUser {
 	}
 
 	public String getUserNo() {
-		return null;
+		return "";
 	}
 
 	public void setUserNo(String userNo) {