禅道bug修改

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentScrapMapper.xml

@@ -21,9 +21,10 @@
     <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.EquipmentScrapVo">
         SELECT es.*,
         e.name as equipmentName, e.code as code, e.brand as brand, e.model as model, e.purchase_date as purchaseDate,
-        e.assets_value as assetsValue
+        e.assets_value as assetsValue, su.name as userName
         FROM equipment_scrap es
         left join equipment e on e.id = es.equipment_id
+        left join sys_user su on su.id = es.user_id
         <include refid="where"/>
         ORDER BY es.create_time ASC
     </select>

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EquipmentScrapVo.java

@@ -46,6 +46,9 @@ public class EquipmentScrapVo {
 	@ApiModelProperty("申请人id")
 	private Integer userId;
 
+	@ApiModelProperty("申请人姓名")
+	private Integer userName;
+
 	@ApiModelProperty("报废原因")
 	private String scrapReason;
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SupplierServiceImpl.java

@@ -73,6 +73,9 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 		if (StringUtils.isEmpty(query.getName())) {
 			return BaseResponse.errorMsg("供应商名称不能为空!");
 		}
+		if (query.getContactsPhone().length() > 11) {
+			return BaseResponse.errorMsg("联系人电话长度过长!");
+		}
 		QueryWrapper<Supplier> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		int count = supplierMapper.selectCount(qw);
@@ -97,6 +100,9 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 		if (StringUtils.isEmpty(query.getName())) {
 			return BaseResponse.errorMsg("供应商名称不能为空!");
 		}
+		if (query.getContactsPhone().length() > 11) {
+			return BaseResponse.errorMsg("联系人电话长度过长!");
+		}
 		QueryWrapper<Supplier> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		qw.ne("id", query.getId());