77

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertServiceImpl.java

@@ -164,7 +164,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
         comExpert = new ComExpert();
         comExpert.setId(dto.getId());
         comExpert.setRemark(dto.getRemark());
-        if(dto.getReportState()!=null){
+        if (dto.getReportState() != null) {
             comExpert.setReportState(dto.getReportState());
         }
         this.update(comExpert);
@@ -176,9 +176,13 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
 
     @Transactional
     public String deleteExpert(ComExpertDTO d) {
-        //systemUserRoleService.deleteById(d.getUserRoleId());
-        if (null != d.getUserRoleId())
+//        this.deleteById(d.getId());
+//        comExpertSpecService.deleteById(d.getId());
+//        comPersonService.deleteById(d.getId());
+//        systemUserService.deleteById(d.getId());
+        if (null == d.getUserRoleId())
             throw new BusinessException("系统限制，专家暂时不能删除！");
+        systemUserRoleService.deleteById(d.getUserRoleId());
         return d.getUserRoleId();
     }
 
@@ -191,7 +195,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
         return id;
     }
 
-    public String expertImport(List<ComExpertDTO> list,String unitName) {
+    public String expertImport(List<ComExpertDTO> list, String unitName) {
         try {
             //职称
             List<SystemParameter> titleList = systemParameterService.getListByType(7);
@@ -234,7 +238,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
                     e.setUnitId(SecurityUserHolder.getUnitId());
                     e.setWorkUnit(unitName);
                     e.setReportState(1);
-                }else{
+                } else {
                     e.setWorkUnit(e.getUnitName());
                     e.setReportState(2);
                 }