修改查询商品 bug 以及更新商户信息时未更新商户部门信息BUG

dgtly-admin/src/main/java/com/dgtly/web/controller/company/CompanyController.java

@@ -249,10 +249,10 @@ public class CompanyController extends BaseController
     }
 
     /**
-     * 审核商户入驻
+     * 审核商户修改
      */
     @RequiresPermissions("companyext:editexamine:approve")
-    @Log(title = "审核商户入驻", businessType = BusinessType.UPDATE)
+    @Log(title = "审核商户修改", businessType = BusinessType.UPDATE)
     @PostMapping("/editexamine/approve")
     @ResponseBody
     public AjaxResult editapprove(CompanyExamine companyExamine)

dgtly-goods/dgtly-goods-admin/src/main/java/com/dgtly/goods/controller/GoodsInfoController.java

@@ -129,6 +129,7 @@ public class GoodsInfoController extends BaseController
             String fileUrl = FileUploadUtils.base64ToFile(base64,FileUploadUtils.getDefaultBaseDir()+"/content",System.currentTimeMillis()+"."+houzhui);
             goodsInfo.setCover(fileUrl);
         }
+        goodsInfo.setCreateBy(ShiroUtils.getLoginName());
         return toAjax(goodsInfoService.insertGoodsInfo(goodsInfo));
     }
 

dgtly-system/src/main/java/com/dgtly/system/service/impl/SysCompanyServiceImpl.java

@@ -244,7 +244,7 @@ public class SysCompanyServiceImpl implements ISysCompanyService
         user.setLoginName(cr.getLoginName());
         user.setUserName("商户管理员");
         user.setPassword(cr.getPassword());
-        user.setPhonenumber(cr.getContactNumber());
+       // user.setPhonenumber(cr.getContactNumber());
 
         if(addCompany(company,user)>0){
             CompanyReviewed upCr = new CompanyReviewed();
@@ -281,8 +281,17 @@ public class SysCompanyServiceImpl implements ISysCompanyService
         int i = 0;
         CompanyReviewed cr = companyReviewedMapper.selectCompanyReviewedById(companyExamine.getCompanyReviewedId());
         if(cr==null){
-            throw  new RuntimeException("创建公司实体时出错!");
+            throw  new RuntimeException("更新公司实体时出错!");
+        }
+        SysDept pramDept = new SysDept();
+        pramDept.setCompanyId(cr.getCompanyId());
+        List<SysDept> sysDepts = sysDeptService.selectDeptList(pramDept);
+        if(sysDepts.size()<1){
+            throw  new RuntimeException("更新公司信息时出错!");
         }
+        SysDept sysDept = sysDepts.get(0);
+        sysDept.setDeptName(cr.getCompanyName());
+        sysDeptService.updateDept(sysDept);
         SysCompany company = reviewedTocompany(cr);
         company.setId(cr.getCompanyId());
         company.setUpdateBy(cr.getCreateBy());