Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IOrgUsrService.java

@@ -7,7 +7,9 @@ import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
+import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -105,4 +107,6 @@ public interface IOrgUsrService {
 	Map<String, Object> selectForShowById (OrgUsr orgUsr,Long id) throws Exception;
 
 	List<OrgUsr> selectCompanyDepartmentMsg();
+
+	void saveOrgUsr( OrgUsrVo OrgUsrVo) throws Exception;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrController.java

@@ -69,11 +69,8 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
-    public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo) {
-        OrgUsr orgUsr = new OrgUsr();
-        BeanUtils.copyProperties(OrgUsrVo, orgUsr);
-        orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-        iOrgUsrService.saveOrgUsrAlertFormValue(orgUsr,OrgUsrVo.getAlertFormValue());
+    public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo) throws Exception {
+        iOrgUsrService.saveOrgUsr(OrgUsrVo);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -252,7 +249,7 @@ public class OrgUsrController extends BaseController {
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
+    @RequestMapping(value = "/saveCompany", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "导入单位信息", notes = "导入单位信息")
     public ResponseModel saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrVo> OrgUsrVo) {
         for (int i = 0; i < OrgUsrVo.size(); i++) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrServiceImpl.java

@@ -16,6 +16,8 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -395,4 +397,13 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
     public List<OrgUsr> selectCompanyDepartmentMsg() {
         return this.baseMapper.selectCompanyDepartmentMsg();
     }
+
+    @Override
+    public void saveOrgUsr(OrgUsrVo OrgUsrVo) throws Exception {
+        OrgUsr orgUsr = new OrgUsr();
+        BeanUtils.copyProperties(OrgUsrVo, orgUsr);
+        orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
+        saveOrgUsrAlertFormValue(orgUsr,OrgUsrVo.getAlertFormValue());
+    }
+
 }