Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java

@@ -56,7 +56,7 @@ public class BmCompanyInfoController extends BaseController {
     /**
      * 新增 -- 录入企业信息
      */
-    @RequiresPermissions("system:company:add")
+    //@RequiresPermissions("system:company:add")
     @Log(title = "企业管理", businessType = BusinessType.INSERT)
     @PostMapping("addCompanyInfo")
     public AjaxResult add(@RequestBody BmCompanyInfoDto obj) {

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java

@@ -45,6 +45,20 @@ public class BmCompanyTypeController extends BaseController {
 
     }
 
+    /**
+     * 根据条件查询企业所属
+     * @return
+     */
+    @PostMapping("/selectCompanyLtd")
+    public TableDataInfo selectCompanyLtd(@RequestBody SysDic sysDic){
+
+        startPage();
+        sysDic.setPId(5);
+        List<SysDic> list = bmCompanyTypeService.selectCompanyTypeList(sysDic);
+        return getDataTable(list);
+
+    }
+
     /**
      * 根据条件查询证件类型
      * @return

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.bonus.zlpt.company.service.impl;
 
 import com.bonus.zlpt.common.core.utils.bean.BeanUtils;
+import com.bonus.zlpt.common.security.utils.SecurityUtils;
 import com.bonus.zlpt.company.domain.dto.BmCompanyDto;
 import com.bonus.zlpt.company.domain.dto.BmCompanyInfoDto;
 import com.bonus.zlpt.company.domain.vo.BmCompanyInfoVo;
@@ -20,6 +21,7 @@ import com.bonus.zlpt.company.domain.BmCompanyInfo;
 import com.bonus.zlpt.company.mapper.BmCompanyInfoDao;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -61,6 +63,9 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
     @Transactional
     public int insertSelective(BmCompanyInfoDto record) {
 
+        record.getBmCompanyInfo().setCreateTime(LocalDateTime.now().toString());
+        record.getBmCompanyInfo().setCreator(SecurityUtils.getUsername());
+        record.getBmCompanyInfo().setStatus("0");
         bmCompanyInfoMapper.insertSelective(record.getBmCompanyInfo());
         record.getBmCoBank().setCoId(record.getBmCompanyInfo().getCompanyId());
         return bmCoBankMapper.insertSelective(record.getBmCoBank());