zouxuan 5 years ago
parent
commit
d2cef8450c

+ 2 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java

@@ -71,7 +71,8 @@ public class EmployeeController extends BaseController {
 	@ApiOperation("删除")
 	@PostMapping(value = "/del/{id}")
 	public HttpResponseResult add(@PathVariable("id") Integer id) {
-		return succeed(employeeService.delete(id));
+		employeeService.del(id);
+		return succeed();
 	}
 
 }

+ 2 - 0
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/EmployeeService.java

@@ -17,4 +17,6 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
      * @param employee
      */
     void updateEmployee(Employee employee);
+
+    void del(Integer id);
 }

+ 9 - 0
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/EmployeeServiceImpl.java

@@ -12,6 +12,7 @@ import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.entity.Employee;
+import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.service.EmployeeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -106,4 +107,12 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 		sysUserDao.update(sysUser);
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName(),sysUser.getAvatar()));
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void del(Integer id) {
+		Employee employee = employeeDao.get(id);
+		sysUserDao.delEmployeeRole(employee.getUserId());
+		employeeDao.delete(id);
+	}
 }