添加机构，重写机构和用户关系

src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java

@@ -0,0 +1,65 @@
+package com.jsh.erp.service.orgaUserRel;
+
+import com.jsh.erp.service.ICommonQuery;
+import com.jsh.erp.service.organization.OrganizationResource;
+import com.jsh.erp.service.organization.OrganizationService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Description
+ *
+ * @Author: cjl
+ * @Date: 2019/3/11 18:10
+ */
+@Service(value = "orgaUserRel_component")
+@OrgaUserRelResource
+public class OrgaUserRelComponent implements ICommonQuery {
+    @Resource
+    private OrgaUserRelService orgaUserRelService;
+    @Override
+    public Object selectOne(String condition) {
+        return null;
+    }
+
+    @Override
+    public List<?> select(Map<String, String> parameterMap) {
+        return getOrgaUserRelList(parameterMap);
+    }
+    private List<?> getOrgaUserRelList(Map<String, String> map) {
+        return null;
+    }
+    @Override
+    public Long counts(Map<String, String> parameterMap) {
+        return null;
+    }
+
+    @Override
+    public int insert(String beanJson, HttpServletRequest request) {
+        return orgaUserRelService.insertOrgaUserRel(beanJson,request);
+    }
+
+    @Override
+    public int update(String beanJson, Long id) {
+        return orgaUserRelService.updateOrgaUserRel(beanJson,id);
+    }
+
+    @Override
+    public int delete(Long id) {
+        return orgaUserRelService.deleteOrgaUserRel(id);
+    }
+
+    @Override
+    public int batchDelete(String ids) {
+        return orgaUserRelService.batchDeleteOrgaUserRel(ids);
+    }
+
+    @Override
+    public int checkIsNameExist(Long id, String name) {
+        return 0;
+    }
+}

src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelResource.java

@@ -0,0 +1,19 @@
+package com.jsh.erp.service.orgaUserRel;
+
+import com.jsh.erp.service.ResourceInfo;
+
+import java.lang.annotation.*;
+
+/**
+ * Description
+ *  机构用户关系
+ * @Author: cjl
+ * @Date: 2019/3/11 18:11
+ */
+@ResourceInfo(value = "orgaUserRel", type = 115)
+@Inherited
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OrgaUserRelResource {
+
+}

src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java

@@ -0,0 +1,119 @@
+package com.jsh.erp.service.orgaUserRel;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.BusinessConstants;
+import com.jsh.erp.datasource.entities.*;
+import com.jsh.erp.datasource.mappers.OrgaUserRelMapper;
+import com.jsh.erp.datasource.mappers.OrgaUserRelMapperEx;
+import com.jsh.erp.service.organization.OrganizationService;
+import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.utils.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @Author: cjl
+ * @Date: 2019/3/11 18:11
+ */
+@Service
+public class OrgaUserRelService {
+    private Logger logger = LoggerFactory.getLogger(OrganizationService.class);
+
+    @Resource
+    private OrgaUserRelMapper orgaUserRelMapper;
+    @Resource
+    private OrgaUserRelMapperEx orgaUserRelMapperEx;
+    @Resource
+    private UserService userService;
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int insertOrgaUserRel(String beanJson, HttpServletRequest request) {
+        OrgaUserRel orgaUserRel = JSONObject.parseObject(beanJson, OrgaUserRel.class);
+        return orgaUserRelMapper.insertSelective(orgaUserRel);
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int updateOrgaUserRel(String beanJson, Long id) {
+        OrgaUserRel orgaUserRel = JSONObject.parseObject(beanJson, OrgaUserRel.class);
+        orgaUserRel.setId(id);
+        return orgaUserRelMapper.updateByPrimaryKeySelective(orgaUserRel);
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int deleteOrgaUserRel(Long id) {
+        return orgaUserRelMapper.deleteByPrimaryKey(id);
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchDeleteOrgaUserRel(String ids) {
+        List<Long> idList = StringUtil.strToLongList(ids);
+        OrgaUserRelExample example = new OrgaUserRelExample();
+        example.createCriteria().andIdIn(idList);
+        return orgaUserRelMapper.deleteByExample(example);
+    }
+    /**
+     * create by: cjl
+     * description:
+     *  新增机构用户关联关系,反显id
+     * create time: 2019/3/12 9:40
+     * @Param: orgaUserRel
+     * @return void
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public OrgaUserRel addOrgaUserRel(OrgaUserRel orgaUserRel) throws Exception{
+        Date date = new Date();
+        User userInfo=userService.getCurrentUser();
+        //创建时间
+        if(orgaUserRel.getCreateTime()==null){
+            orgaUserRel.setCreateTime(date);
+        }
+        //创建人
+        if(orgaUserRel.getCreator()==null){
+            orgaUserRel.setCreator(userInfo==null?null:userInfo.getId());
+        }
+        //更新时间
+        if(orgaUserRel.getUpdateTime()==null){
+            orgaUserRel.setUpdateTime(date);
+        }
+        //更新人
+        if(orgaUserRel.getUpdater()==null){
+            orgaUserRel.setUpdater(userInfo==null?null:userInfo.getId());
+        }
+        orgaUserRel.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS);
+        int i=orgaUserRelMapperEx.addOrgaUserRel(orgaUserRel);
+        if(i>0){
+            return orgaUserRel;
+        }
+        return null;
+    }
+    /**
+     * create by: cjl
+     * description:
+     *  更新机构用户关联关系
+     * create time: 2019/3/12 9:40
+     * @Param: orgaUserRel
+     * @return void
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public OrgaUserRel updateOrgaUserRel(OrgaUserRel orgaUserRel) {
+        User userInfo=userService.getCurrentUser();
+        //更新时间
+        if(orgaUserRel.getUpdateTime()==null){
+            orgaUserRel.setUpdateTime(new Date());
+        }
+        //更新人
+        if(orgaUserRel.getUpdater()==null){
+            orgaUserRel.setUpdater(userInfo==null?null:userInfo.getId());
+        }
+       int i= orgaUserRelMapperEx.updateOrgaUserRel(orgaUserRel);
+        if(i>0){
+            return orgaUserRel;
+        }
+        return null;
+    }
+}