yuansh преди 2 месеца
родител
ревизия
dc8b881ec8

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -287,6 +287,11 @@ public class LoginController {
 		this.sysUserService.updateUserDepart(username, orgCode,tenantId);
 		SysUser sysUser = sysUserService.getUserByName(username);
 		JSONObject obj = new JSONObject();
+
+		if(StringUtils.isNotBlank(orgCode)){
+			sysUser.setOrgName(sysDepartService.queryNameByCode(orgCode));
+		}
+
 		obj.put("userInfo", sysUser);
 		result.setResult(obj);
 		return result;

+ 9 - 1
srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleDeliveryController.java

@@ -155,6 +155,14 @@ public class SaleDeliveryController {
         return Result.OK(pageList);
     }
 
+    /**
+     * 销售发票使用
+     * @param saleInquiryForm
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @ApiOperation(value = "发货通知单弹框明细", notes = "发货通知单弹框明细")
     @GetMapping(value = "/selectSaleDeliveryAlertInvoice")
     @PermissionData(pageComponent="saleCode/deliveryNotice/deliveryNoticeList")
@@ -170,7 +178,7 @@ public class SaleDeliveryController {
     }
 
 
-    @ApiOperation(value = "发货通知单弹框明细(运费采购订单) 无用", notes = "发货通知单弹框明细")
+    @ApiOperation(value = "发货通知单弹框明细(运费采购订单) 无用,运费改成整单选择", notes = "发货通知单弹框明细")
     @GetMapping(value = "/selectSaleDeliveryAlertFee")
     public Result<IPage<SaleDeliveryAlert>> selectSaleDeliveryAlertFee(SaleDeliveryAlert saleInquiryForm,
                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,