增加企业

jxjy-lib/src/main/java/data/system/Org.java

@@ -86,4 +86,10 @@ public class Org extends NameObj {
     @TableField("id_no")
     private String idNo;
 
+    /**
+     * admin 后台创建  person 用户创建
+     **/
+    @TableField("type")
+    private String type;
+
 }

jxjy-system/src/main/java/com/jxjy/system/controller/OrgController.java

@@ -53,8 +53,10 @@ public class OrgController extends BaseController {
     @PostMapping("/c")
     public BaseResult create(@RequestBody Org org){
         //判断是否重复
-        if(orgService.isHave(org.getOpenId(),org.getId())){
-            return BaseResult.error("error_004");
+        if(org.getType().equals("person")){
+            if(orgService.isHave(org.getOpenId(),org.getId())){
+                return BaseResult.error("error_004");
+            }
         }
         return orgService.create(org)?BaseResult.success("normal_001"):BaseResult.error("error_001");
     }

jxjy-system/src/main/java/com/jxjy/system/service/impl/OrgServiceImpl.java

 package com.jxjy.system.service.impl;
 
+import base.result.BaseResult;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -49,6 +50,7 @@ public class OrgServiceImpl extends ServiceImpl<OrgMapper, Org> implements OrgSe
         qw.like(StringUtils.isNotBlank(org.getName()),Org::getName,org.getName())
                 .eq(Org::getDel,false)
                 .eq(StringUtils.isNotBlank(org.getCheckStatus()),Org::getCheckStatus,org.getCheckStatus())
+                .eq(StringUtils.isNotBlank(org.getType()),Org::getType,org.getType())
                 .eq(StringUtils.isNotBlank(org.getBaseCode()),Org::getBaseCode, org.getBaseCode())
                 .eq(StringUtils.isNotBlank(org.getIdNo()),Org::getIdNo,org.getIdNo())
                 .orderByDesc(Org::getCreateTime);
@@ -94,7 +96,12 @@ public class OrgServiceImpl extends ServiceImpl<OrgMapper, Org> implements OrgSe
         org.setBaseCode(baseCode);
         org.setDel(false);
         org.setCreateTime(DateUtil.now());
-        org.setCheckStatus("0");
+
+        if(org.getType().equals("person")){
+            org.setCheckStatus("0");
+        }else if(org.getType().equals("admin")){
+            org.setCheckStatus("1");
+        }
 
         /*if(!userContext.getType().equals("admin")){
             org.setCheckStatus("0");